summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2009-11-26 02:23:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-18 06:45:06 (GMT)
commit8cc5b29065e19267cbc08b39c34674b02c2e3d59 (patch)
treea7fc209fac5df7d2a9c9a5795fb4f58746ae3840 /ll-merge.h
parent73eb40eeaaebc5ebae283c06286b96b4aea00143 (diff)
downloadgit-8cc5b29065e19267cbc08b39c34674b02c2e3d59.zip
git-8cc5b29065e19267cbc08b39c34674b02c2e3d59.tar.gz
git-8cc5b29065e19267cbc08b39c34674b02c2e3d59.tar.bz2
git merge -X<option>
Teach "-X <option>" command line argument to "git merge" that is passed to strategy implementations. "ours" and "theirs" autoresolution introduced by the previous commit can be asked to the recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
-rw-r--r--ll-merge.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.h b/ll-merge.h
index 5388422..aaed46d 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -10,6 +10,6 @@ int ll_merge(mmbuffer_t *result_buf,
mmfile_t *ancestor,
mmfile_t *ours, const char *our_label,
mmfile_t *theirs, const char *their_label,
- int virtual_ancestor);
+ int flag);
#endif