git-merge: squelch needless error message.
authorJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 18:52:04 +0000 (10:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 18:52:04 +0000 (10:52 -0800)
commit211e6eb...13f372ad79fecc3db19413b3573ae962
tree0425cf6...ba0b88f4e332d61ec3f749d5e4be9705copy hash to clipboard (tree)
parentc0b7391...f5dd314523b8c6ea29ffafc8769f2eb1copy hash to clipboard (diff)
git-merge.sh