git-merge: tighten error checking.
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Nov 2006 06:16:31 +0000 (22:16 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Nov 2006 06:16:31 +0000 (22:16 -0800)
commit51901e9...bf592877f7b266d0d9c6cb83b363edce
treec10a65d...e93bbb26882a9a22b5a25404100cbc47copy hash to clipboard (tree)
parent8092c7f...af044836abf83ed26d542327a4b95c08copy hash to clipboard (diff)
git-merge.sh