diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:41 -0700 |
commit | 16b8a3e4b94dc7f6e05b624eae3cf1eed7b358a5 (patch) | |
tree | d45db6fedb240fa977582ec8d76f1b340be44850 /rerere.c | |
parent | 40a56f45bcfeb5443bbd3b7f9e9f7ffd570d5398 (diff) | |
parent | 7ca56aa07619b0345b643e52ae8e616cbaafc187 (diff) | |
download | git-16b8a3e4b94dc7f6e05b624eae3cf1eed7b358a5.tar.gz git-16b8a3e4b94dc7f6e05b624eae3cf1eed7b358a5.tar.xz |
Merge branch 'jn/merge-diff3-label'
* jn/merge-diff3-label:
merge-recursive: add a label for ancestor
cherry-pick, revert: add a label for ancestor
revert: clarify label on conflict hunks
compat: add mempcpy()
checkout -m --conflict=diff3: add a label for ancestor
merge_trees(): add ancestor label parameter for diff3-style output
merge_file(): add comment explaining behavior wrt conflict style
checkout --conflict=diff3: add a label for ancestor
ll_merge(): add ancestor label parameter for diff3-style output
merge-file --diff3: add a label for ancestor
xdl_merge(): move file1 and file2 labels to xmparam structure
xdl_merge(): add optional ancestor label to diff3-style output
tests: document cherry-pick behavior in face of conflicts
tests: document format of conflicts from checkout -m
Conflicts:
builtin/revert.c
Diffstat (limited to 'rerere.c')
-rw-r--r-- | rerere.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |