summaryrefslogtreecommitdiff
path: root/t/t4034-diff-words.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-03-20 19:46:07 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-20 20:36:11 -0700
commitbf975d379d79ab0eb9e8835af4abab4712e71dad (patch)
treebaf1f251aad5ba058643a67edba4885c1bbe9144 /t/t4034-diff-words.sh
parentrevert: clarify label on conflict hunks (diff)
downloadtgif-bf975d379d79ab0eb9e8835af4abab4712e71dad.tar.xz
cherry-pick, revert: add a label for ancestor
When writing conflict hunks in ‘diff3 -m’ format, also add a label to the common ancestor. Especially in a cherry-pick, it is not immediately obvious without such a label what the common ancestor represents. git rerere does not have trouble parsing the new output and its preimage ids are unchanged since it includes its own code for recreating conflict hunks. No other code in git parses 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/t4034-diff-words.sh')
0 files changed, 0 insertions, 0 deletions