Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
coccinelle: convert hashcpy() with null_sha1 to hashclr()
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index b555a1bf9cd46ea57bcbe1c8d8b7ac146fe9f81c..a9b99c9ffc663bbb776d69c4d9886ab1bc5dbc4c 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-1530,7
+1530,7
@@
int cmd_merge(int argc, const char **argv, const char *prefix)
* Stash away the local changes so that we can try more than one.
*/
save_state(stash))
- hashc
py(stash, null_sha1
);
+ hashc
lr(stash
);
for (i = 0; i < use_strategies_nr; i++) {
int ret;