Use extended SHA1 syntax in merge-recursive conflicts.

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 4ebfcf65d99f7743048df901b38969c28cc11edb..aec215e725826fb18a4d3d75408aa44acdd3e5de 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -32,7 +32,7 @@ savestate() {
 restorestate() {
         if test -f "$GIT_DIR/MERGE_SAVE"
        then
-               git reset --hard $head
+               git reset --hard $head >/dev/null
                cpio -iuv <"$GIT_DIR/MERGE_SAVE"
                git-update-index --refresh >/dev/null
        fi