diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-29 21:49:56 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 06:41:44 +0400 |
| commit | b541248467fa47979a34e3f1c5bbe3308fbdc4d1 (patch) | |
| tree | af1b1accf5962ebb10b7422e5ec6479e78b31b66 /xdiff-interface.h | |
| parent | 387c9d49815ef4b1cefda71cf27f199d9fb24083 (diff) | |
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.h | 2 |
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 |