Merge branch 'maint'

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 70794c71fcbf198c7425a49789a912369fba28ad..d782f06d9916bdde33dc3f7312f9eac4e14ef3a1 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -328,4 +328,3 @@ int git_xmerge_config(const char *var, const char *value, void *cb)
        }
        return git_default_config(var, value, cb);
 }
-