summaryrefslogtreecommitdiff
path: root/t/t1512-rev-parse-disambiguation.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-11-07 20:40:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-08 14:23:53 +0900
commit48c9cb9d6d058bcf18e931a1ed0d88792bb506c9 (patch)
tree977129baf18dc58d9a54c4b3d5cb4d21691851d5 /t/t1512-rev-parse-disambiguation.sh
parentmerge-recursive: use handle_file_collision for add/add conflicts (diff)
downloadtgif-48c9cb9d6d058bcf18e931a1ed0d88792bb506c9.tar.xz
merge-recursive: improve rename/rename(1to2)/add[/add] handling
When we have a rename/rename(1to2) conflict, each of the renames can collide with a file addition. Each of these rename/add conflicts suffered from the same kinds of problems that normal rename/add suffered from. Make the code use handle_file_conflicts() as well so that we get all the same fixes and consistent behavior between the different conflict types. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1512-rev-parse-disambiguation.sh')
0 files changed, 0 insertions, 0 deletions