Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
submodule.c: tighten scope of changed_submodule_names struct
[gitweb.git]
/
builtin
/
rerere.c
diff --git
a/builtin/rerere.c
b/builtin/rerere.c
index e89ccbc524a62d5a8760311a2797dfa49fe8525d..d78eeaed329e5c647e5474b6a4205194b539f4b4 100644
(file)
--- a/
builtin/rerere.c
+++ b/
builtin/rerere.c
@@
-41,7
+41,8
@@
static int diff_two(const char *file1, const char *label1,
xpp.flags = 0;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
- ecb.outf = outf;
+ ecb.out_hunk = NULL;
+ ecb.out_line = outf;
ret = xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
free(minus.ptr);