[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

diff --git a/git-reset-script b/git-reset-script
index eaefd00d9d1e8adddb56040af0156d209815cc89..0c02aa6423ec485e19bd7439c926addbb8fd029d 100755 (executable)
--- a/git-reset-script
+++ b/git-reset-script
@@ -1,3 +1,5 @@
 #!/bin/sh
+. git-sh-setup-script || die "Not a git archive"
 git-read-tree --reset HEAD
 git-update-cache --refresh
+rm -f "$GIT_DIR/MERGE_HEAD"