Merge branch 'ep/maint-equals-null-cocci' for maint-2.35

[thirdparty/git.git] / xdiff-interface.c

diff --git a/xdiff-interface.c b/xdiff-interface.c
index a2f086e5b3011d6c71e3a70af60286cc868cb522..e87950de32e5602765de26953ce7ec812ef30925 100644 (file)
--- 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;
                /*