summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-29 10:49:56 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-30 19:41:44 -0700
commitb541248467fa47979a34e3f1c5bbe3308fbdc4d1 (patch)
treeaf1b1accf5962ebb10b7422e5ec6479e78b31b66 /xdiff-interface.h
parent387c9d49815ef4b1cefda71cf27f199d9fb24083 (diff)
downloadgit-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.gz
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
This teaches "git merge-file" to honor merge.conflictstyle configuration variable, whose value can be "merge" (default) or "diff3". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index f7f791d96b..cfe3215cb2 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -22,5 +22,7 @@ int read_mmfile(mmfile_t *ptr, const char *filename);
int buffer_is_binary(const char *ptr, unsigned long size);
extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line);
+extern int git_xmerge_config(const char *var, const char *value, void *cb);
+extern int git_xmerge_style;
#endif