Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tests: Say "pass" rather than "ok" on empty lines for TAP
[gitweb.git]
/
merge-file.c
diff --git
a/merge-file.c
b/merge-file.c
index c336c93c01c0bad76d6189065f0e6630d0b7f5af..db4d0d50d32d8852d1cb5173125e4173c3badb49 100644
(file)
--- a/
merge-file.c
+++ b/
merge-file.c
@@
-66,7
+66,7
@@
static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
xdemitcb_t ecb;
memset(&xpp, 0, sizeof(xpp));
- xpp.flags =
XDF_NEED_MINIMAL
;
+ xpp.flags =
0
;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
xecfg.flags = XDL_EMIT_COMMON;