Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pager: set LESS=FRSX also on Windows
[gitweb.git]
/
builtin-rerere.c
diff --git
a/builtin-rerere.c
b/builtin-rerere.c
index 020af7377bb9aa1bced7489d40169e3cb2ff7682..adfb7b5f48597c19c23235b74cf1a0c779985dc6 100644
(file)
--- a/
builtin-rerere.c
+++ b/
builtin-rerere.c
@@
-116,7
+116,7
@@
int cmd_rerere(int argc, const char **argv, const char *prefix)
if (!has_rerere_resolution(name))
unlink_rr_item(name);
}
- unlink(git_path("rr-cache/MERGE_RR"));
+ unlink
_or_warn
(git_path("rr-cache/MERGE_RR"));
} else if (!strcmp(argv[1], "gc"))
garbage_collect(&merge_rr);
else if (!strcmp(argv[1], "status"))