summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-21 00:42:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 03:36:11 (GMT)
commitc4151629e7019d072cefdac992e164820ce9ed1c (patch)
treeb86266d989ce2ef2b8723fca49358aee8c55b1ae /t/t3507-cherry-pick-conflict.sh
parent4c5868f43d1ec2573f4f511d732bc00d56accc70 (diff)
downloadgit-c4151629e7019d072cefdac992e164820ce9ed1c.zip
git-c4151629e7019d072cefdac992e164820ce9ed1c.tar.gz
git-c4151629e7019d072cefdac992e164820ce9ed1c.tar.bz2
checkout -m --conflict=diff3: add a label for ancestor
git checkout --merge --conflict=diff3 can be used to present conflict hunks including text from the common ancestor. The added information is helpful for resolving a merge by hand, and merge tools tend to understand it because it is very similar to what ‘diff3 -m’ produces. Unlike current git, diff3 -m includes a label for the merge base on the ||||||| line, and unfortunately, some tools cannot parse the conflict hunks without it. Humans can benefit from a cue when learning to interpreting the format, too. Mark the start of the text from the old branch with a label based on the branch’s name. git rerere does not have trouble parsing this output and its preimage ids are unchanged since it includes its own code for recreating conflict hunks. No other code in git tries to parse conflict hunks. Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions