git-merge documentation: describe how conflict is presented

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 4b8e5cca804198b0e227454a585fa025281bbe2d..295198333db439c09dee0abeaa6644369835ad06 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -152,8 +152,8 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
        if ((f = fopen(filename, "rb")) == NULL)
                return error("Could not open %s", filename);
        sz = xsize_t(st.st_size);
-       ptr->ptr = xmalloc(sz);
-       if (fread(ptr->ptr, sz, 1, f) != 1)
+       ptr->ptr = xmalloc(sz ? sz : 1);
+       if (sz && fread(ptr->ptr, sz, 1, f) != 1)
                return error("Could not read %s", filename);
        fclose(f);
        ptr->size = sz;
@@ -233,8 +233,27 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value)
                        expression = value;
                if (regcomp(&reg->re, expression, 0))
                        die("Invalid regexp to look for hunk header: %s", expression);
-               if (buffer)
-                       free(buffer);
+               free(buffer);
                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);
+}
+