unpack-trees: do not fail reset because of unmerged skipped entry

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 9879c59395edff1a02e390397fc623bc60724c57..f6d9852d2f618393412016cc81c73b1e8362a59d 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -120,7 +120,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        case "$1" in
        '')
                echo "Added $4 in both, but differently."
-               orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+               orig=$(git unpack-file $(git hash-object /dev/null))
                ;;
        *)
                echo "Auto-merging $4"