Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
doc/SubmittingPatches: show how to get a CLI commit summary
[gitweb.git]
/
merge.c
diff --git
a/merge.c
b/merge.c
index 23866c91655638d9e1a7213478772b78aa9d7c69..04ee5fc911c8d8134decb5c1a400576ae5681bf6 100644
(file)
--- a/
merge.c
+++ b/
merge.c
@@
-57,7
+57,7
@@
int checkout_fast_forward(const unsigned char *head,
refresh_cache(REFRESH_QUIET);
- if (hold_locked_index(lock_file,
0
) < 0)
+ if (hold_locked_index(lock_file,
LOCK_REPORT_ON_ERROR
) < 0)
return -1;
memset(&trees, 0, sizeof(trees));