Fix overzealous cleanliness check in git-merge
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 07:43:04 +0000 (00:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Sep 2005 01:04:17 +0000 (18:04 -0700)
commita935824...36dc2c5a8ef1980a4b05a12228712754
tree22d7522...c0361d43f4a594eaeb6a557e2b2d9164copy hash to clipboard (tree)
parent036a72d...fa25d9c56c19ae4c761401a58c43b8f6copy hash to clipboard (diff)
git-merge.sh