Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tests: eliminate unnecessary setup test assertions
[gitweb.git]
/
rerere.c
diff --git
a/rerere.c
b/rerere.c
index 3d00a71ff9730ed4a10114185f4360de698c1fbf..22dfc843da1528ffd0466d496c50c56702e55a24 100644
(file)
--- a/
rerere.c
+++ b/
rerere.c
@@
-438,7
+438,7
@@
static int merge(const char *name, const char *path)
ret = 1;
goto out;
}
- ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "",
0
);
+ ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "",
NULL
);
if (!ret) {
FILE *f;