diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 19:38:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 20:36:11 -0700 |
| commit | f01de62e4591a6acc061eb994d44f7eeef7a0cfd (patch) | |
| tree | 85ede25d7697736056133412abae4739fa79cb36 /t/t9109-git-svn-multi-glob.sh | |
| parent | merge-file --diff3: add a label for ancestor (diff) | |
| download | tgif-f01de62e4591a6acc061eb994d44f7eeef7a0cfd.tar.xz | |
ll_merge(): add ancestor label parameter for diff3-style output
Commands using the ll_merge() function will present conflict hunks
imitating ‘diff3 -m’ output if the merge.conflictstyle configuration
option is set appropriately. Unlike ‘diff3 -m’, the output does not
include a label for the merge base on the ||||||| line of the output,
and some tools misparse the conflict hunks without that.
Add a new ancestor_label parameter to ll_merge() to give callers the
power to rectify this situation. If ancestor_label is NULL, the output
format is unchanged. All callers pass NULL for now.
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/t9109-git-svn-multi-glob.sh')
0 files changed, 0 insertions, 0 deletions