[PATCH] git-merge-cache -q doesn't complain about failing merge program

[git/dscho.git] / git-reset-script

#!/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"