Merge branch 'maint'

[git.git] / builtin / rerere.c

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 73610b6bc29285a4a4481458c86817ea2ab3ccf6..980d5421eee881ccb84c20dfb7aaae7dbb6a06ab 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -89,7 +89,7 @@ static int diff_two(const char *file1, const char *label1,
        printf("--- a/%s\n+++ b/%s\n", label1, label2);
        fflush(stdout);
        memset(&xpp, 0, sizeof(xpp));
-       xpp.flags = XDF_NEED_MINIMAL;
+       xpp.flags = 0;
        memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = 3;
        ecb.outf = outf;