Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pack-objects: new option --honor-pack-keep
[gitweb.git]
/
merge-file.c
diff --git
a/merge-file.c
b/merge-file.c
index 1e031eafe0c70eec092a53e8ab291b9887622b0e..2a939c9dd835a7e7946eb1548e4cf637ae3ca329 100644
(file)
--- a/
merge-file.c
+++ b/
merge-file.c
@@
-71,7
+71,7
@@
static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
res->size = 0;
ecb.priv = res;
- return xd
l
_diff(f1, f2, &xpp, &xecfg, &ecb);
+ return xd
i
_diff(f1, f2, &xpp, &xecfg, &ecb);
}
void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size)