summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Stephan Beyer <s-beyer@gmx.net>2009-01-15 14:03:17 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-15 14:22:12 -0800
commit944019c8b3896ff8d169864096eedc60155c80a4 (patch)
tree7cec8396c80ed97e18f24293cb38c39326486604 /merge-recursive.c
parentfix handling of multiple untracked files for git mv -k (diff)
downloadtgif-944019c8b3896ff8d169864096eedc60155c80a4.tar.xz
t3501: check that commits are actually done
The basic idea of t3501 is to check whether revert and cherry-pick works on renamed files. But as there is no pure cherry-pick/revert test, it is good to also check if commits are actually done in that scenario. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions