summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2010-09-20 02:28:40 -0600
committerJunio C Hamano <gitster@pobox.com>2010-09-29 17:32:36 -0700
commit52304ecddf9458dcf4321c89c96a5e1bc025676d (patch)
tree677072e6733d475d02132a8e002aee85b2d223fe /git-add--interactive.perl
parent588504b694133cba85982fbace532d2156f859eb (diff)
downloadgit-52304ecddf9458dcf4321c89c96a5e1bc025676d.tar.gz
t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
An interesting testcase is having two files each in their own subdirectory getting renamed to the toplevel at the directory pathname of the other. Questions arise as to whether the order of operations matters and whether the directories can correctly get out of the way and make room for the new files. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
0 files changed, 0 insertions, 0 deletions