summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2010-12-13 17:12:29 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-13 11:54:39 -0800
commit0137ef7dae553f9eb89cbae1ddb60b72046ba28b (patch)
tree90dceeade2a71892c7b458c63ec7982180cdfc61 /merge-file.c
parenttests: flip executable bit on t9158 (diff)
downloadtgif-0137ef7dae553f9eb89cbae1ddb60b72046ba28b.tar.xz
t800?-blame.sh: retitle uniquely
Currently we have three test files matching t800?-blame.sh. Rename the latter two to make it easier to spot where additions would go. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions