git-merge: fix faulty SQUASH_MSG
authorLars Hjemli <hjemli@gmail.com>
Sun, 23 Sep 2007 22:51:41 +0000 (00:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700)
commit2ae4fd7...95abcf2ab36f3fe984cc4ca44559635f
treedfe78ed...228781ffaaa3394cba3412e0cbb90b98copy hash to clipboard (tree)
parenta85d1b6...172f397e815e1ce02db41e4b82b86162copy hash to clipboard (diff)
git-merge.sh