Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Remove the default_headers variable from http-push.c
[gitweb.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index 5a658dc0d54f91faee450e4f9ebacc1a6338478f..e22db8993286a3b3654865d765c9e98f3604b44a 100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-226,7
+226,7
@@
static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
state.num_parent = num_parent;
state.n = n;
- xd
l
_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
+ xd
i
_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
free(parent_file.ptr);
/* Assign line numbers for this parent.