summaryrefslogtreecommitdiff
path: root/t/t9302-fast-import-unpack-limit.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-26 11:40:42 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-03 11:26:59 -0800
commitfd48b464747c275b3d014b3f14d60d9ac19d184a (patch)
treec3108f46efe831642bc1edfbc83a452b943698b3 /t/t9302-fast-import-unpack-limit.sh
parentRelNotes: further fixes for 2.14.2 from the master front (diff)
downloadtgif-fd48b464747c275b3d014b3f14d60d9ac19d184a.tar.xz
merge: teach -Xours/-Xtheirs to symbolic link merge
The -Xours/-Xtheirs merge options were originally defined as a way to "force" the resolution of 3way textual merge conflicts to take one side without using your editor, hence did not even trigger in situations where you would normally not get the <<< === >>> conflict markers. This was improved for binary files back in 2012 with a944af1d ("merge: teach -Xours/-Xtheirs to binary ll-merge driver", 2012-09-08). Teach a similar trick to the codepath that deals with merging two conflicting changes to symbolic links. Signed-off-by: Junio C Hamano <gitster@pobox.com> Tested-by: Yaroslav Halchenko <yoh@onerussian.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9302-fast-import-unpack-limit.sh')
0 files changed, 0 insertions, 0 deletions