diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 19:41:38 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 20:36:11 -0700 |
commit | 4c5868f43d1ec2573f4f511d732bc00d56accc70 (patch) | |
tree | 914ef4ec42db899cb7f4449da1df49d13bb48d57 /write_or_die.c | |
parent | e44b3851c9d5fc840e8f33fb76f473a71b658d10 (diff) | |
download | git-4c5868f43d1ec2573f4f511d732bc00d56accc70.tar.gz git-4c5868f43d1ec2573f4f511d732bc00d56accc70.tar.xz |
merge_trees(): add ancestor label parameter for diff3-style output
Commands using the merge_trees() machinery will present conflict hunks
in output something like what ‘diff3 -m’ produces if the
merge.conflictstyle configuration option is set to diff3. The output
lacks the name of the merge base on the ||||||| line of the output,
and tools can misparse the conflict hunks without it. Add a new
o->ancestor parameter to merge_trees() for use as a label for the
ancestor in conflict hunks.
If o->ancestor is NULL, the output format is as before. All callers
pass NULL for now.
If o->ancestor is non-NULL and both branches renamed the base file
to the same name, that name is included in the conflict hunk labels.
Even if o->ancestor is NULL I think this would be a good change, but
this patch only does it in the non-NULL case to ensure the output
format does not change where it might matter.
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 'write_or_die.c')
0 files changed, 0 insertions, 0 deletions