diff options
Diffstat (limited to 'git-reset.sh')
-rwxr-xr-x | git-reset.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh index 6c9e58ad9..fe53fc806 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -100,4 +100,4 @@ case "$reset_type" in ;; esac -rm -f "$GIT_DIR/MERGE_HEAD" +rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" |