Signed-off-by: Junio C Hamano <junkio@cox.net>
esac
upstream=`git-rev-parse --verify "$1"` &&
esac
upstream=`git-rev-parse --verify "$1"` &&
-ours=`git-rev-parse --verify "$ours_symbolic^` || exit
+ours=`git-rev-parse --verify "$ours_symbolic"` || exit
test "$(git-diff-cache --cached "$ours")" = "" ||
die "Your working tree does not match $ours_symbolic."
test "$(git-diff-cache --cached "$ours")" = "" ||
die "Your working tree does not match $ours_symbolic."