Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t6022: Add testcase for merging a renamed file with a simple change
[gitweb.git]
/
notes-merge.c
diff --git
a/notes-merge.c
b/notes-merge.c
index 1467ad31795ae21896f1e608e7cb032df2bc94a8..28046a998426e88dec9ad6ab431624bb41a81ce1 100644
(file)
--- a/
notes-merge.c
+++ b/
notes-merge.c
@@
-359,7
+359,7
@@
static int ll_merge_in_worktree(struct notes_merge_options *o,
read_mmblob(&remote, p->remote);
status = ll_merge(&result_buf, sha1_to_hex(p->obj), &base, NULL,
- &local, o->local_ref, &remote, o->remote_ref,
0
);
+ &local, o->local_ref, &remote, o->remote_ref,
NULL
);
free(base.ptr);
free(local.ptr);