summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-02-06 15:42:49 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-08 12:18:51 -0800
commit80ce6c25a4289835e197004a54ca75401bea55dc (patch)
tree4bd4b205f18f052907f2000f9497ee1a5877ab89 /builtin/merge-ours.c
parentmingw: do not bother to test funny file names (diff)
downloadtgif-80ce6c25a4289835e197004a54ca75401bea55dc.tar.xz
gitignore: ignore generated test-fake-ssh executable
In "mingw: fix t5601-clone.sh", this developer introduced a new test executable, test-fake-ssh but forgot to update the .gitignore file accordingly. Fix that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions