Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mg/notes-dry-run'
[gitweb.git]
/
builtin
/
rerere.c
diff --git
a/builtin/rerere.c
b/builtin/rerere.c
index 34f9acee910406c7ba0bf9eed76267a0cf8f46c2..0048f9ef7fee24e5e058ef226f3b0fc93703fcf1 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;