summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-21 00:38:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 03:36:11 (GMT)
commitf01de62e4591a6acc061eb994d44f7eeef7a0cfd (patch)
tree85ede25d7697736056133412abae4739fa79cb36 /rerere.c
parent4bb0936206b046a4fe606e9b0c9fe6ecc7a0ff69 (diff)
downloadgit-f01de62e4591a6acc061eb994d44f7eeef7a0cfd.zip
git-f01de62e4591a6acc061eb994d44f7eeef7a0cfd.tar.gz
git-f01de62e4591a6acc061eb994d44f7eeef7a0cfd.tar.bz2
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 'rerere.c')
-rw-r--r--rerere.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rerere.c b/rerere.c
index a59f74f..f221bed 100644
--- a/rerere.c
+++ b/rerere.c
@@ -319,7 +319,7 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
if (!mmfile[i].ptr && !mmfile[i].size)
mmfile[i].ptr = xstrdup("");
}
- ll_merge(&result, path, &mmfile[0],
+ ll_merge(&result, path, &mmfile[0], NULL,
&mmfile[1], "ours",
&mmfile[2], "theirs", 0);
for (i = 0; i < 3; i++)
@@ -376,7 +376,7 @@ static int merge(const char *name, const char *path)
ret = 1;
goto out;
}
- ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
+ ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
if (!ret) {
FILE *f = fopen(path, "w");
if (!f)