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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 81f981509a2b9c129b31772dee5b859b3f1a2315..8c62ba4e7bceef724f4d5cfd0b0a790f1e380f48 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -889,6 +889,14 @@ man.<tool>.path::
        Override the path for the given tool that may be used to
        display help in the 'man' format. See linkgit:git-help[1].
 
+merge.conflictstyle::
+       Specify the style in which conflicted hunks are written out to
+       working tree files upon merge.  The default is "merge", which
+       shows `<<<<<<<` conflict marker, change made by one side,
+       `=======` marker, change made by the other side, and then
+       `>>>>>>>` marker.  An alternate style, "diff3", adds `|||||||`
+       marker and the original text before `=======` marker.
+
 mergetool.<tool>.path::
        Override the path for the given tool.  This is useful in case
        your tool is not in the PATH.

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 1e92510026b552d521c178813f50f4358039e98f..45c98538cdbf35352f7a3b5adf40fca9d7512ea5 100644 (file)
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -15,6 +15,15 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
        int ret = 0, i = 0, to_stdout = 0;
        int merge_level = XDL_MERGE_ZEALOUS_ALNUM;
        int merge_style = 0;
+       int nongit;
+
+       prefix = setup_git_directory_gently(&nongit);
+       if (!nongit) {
+               /* Read the configuration file */
+               git_config(git_xmerge_config, NULL);
+               if (0 <= git_xmerge_style)
+                       merge_style = git_xmerge_style;
+       }
 
        while (argc > 4) {
                if (!strcmp(argv[1], "-L") && i < 3) {

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 20786ce79da82456ba7603b868e8ca1130fe06bd..b76bca888002bf16e1dc8e0a09a717aa99c1cd28 100755 (executable)
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -192,10 +192,17 @@ non timebo mala, quoniam TU mecum es:
 virga tua et baculus tuus ipsa me consolata sunt.
 EOF
 
-test_expect_success '"diff3 -m" style output' '
+test_expect_success '"diff3 -m" style output (1)' '
        test_must_fail git merge-file -p --diff3 \
                new8.txt new5.txt new9.txt >actual &&
        test_cmp expect actual
 '
 
+test_expect_success '"diff3 -m" style output (2)' '
+       git config merge.conflictstyle diff3 &&
+       test_must_fail git merge-file -p \
+               new8.txt new5.txt new9.txt >actual &&
+       test_cmp expect actual
+'
+
 test_done

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 61dc5c547019776b971dc89d009f628bbac134fd..295198333db439c09dee0abeaa6644369835ad06 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -237,3 +237,23 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value)
                value = ep + 1;
        }
 }
+
+int git_xmerge_style = -1;
+
+int git_xmerge_config(const char *var, const char *value, void *cb)
+{
+       if (!strcasecmp(var, "merge.conflictstyle")) {
+               if (!value)
+                       die("'%s' is not a boolean", var);
+               if (!strcmp(value, "diff3"))
+                       git_xmerge_style = XDL_MERGE_DIFF3;
+               else if (!strcmp(value, "merge"))
+                       git_xmerge_style = 0;
+               else
+                       die("unknown style '%s' given for '%s'",
+                           value, var);
+               return 0;
+       }
+       return git_default_config(var, value, cb);
+}
+

diff --git a/xdiff-interface.h b/xdiff-interface.h
index f7f791d96b9a34ef0f08db4b007c5309b9adc3d6..cfe3215cb2e774f5f088fbc1b0e841a27e474eda 100644 (file)
--- 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