diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
| commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b (patch) | |
| tree | 6461c3669e41cebaf33f124d5964c06072803187 /xdiff-interface.c | |
| parent | 62329d336f5d427d8f08035798bf62cd7d8fd847 (diff) | |
| parent | ddfc44a898a58311392a5329687a1813d6b94779 (diff) | |
| download | git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.xz | |
Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added.
* en/zdiff3:
update documentation for new zdiff3 conflictStyle
xdiff: implement a zealous diff3, or "zdiff3"
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 75b32aef51..2e3a5a2943 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -313,6 +313,8 @@ int git_xmerge_config(const char *var, const char *value, void *cb) die("'%s' is not a boolean", var); if (!strcmp(value, "diff3")) git_xmerge_style = XDL_MERGE_DIFF3; + else if (!strcmp(value, "zdiff3")) + git_xmerge_style = XDL_MERGE_ZEALOUS_DIFF3; else if (!strcmp(value, "merge")) git_xmerge_style = 0; /* |