[PATCH] More descriptive messages for conflict cases in merges
authorFredrik Kuivinen <freku045@student.liu.se>
Sun, 25 Sep 2005 14:49:02 +0000 (16:49 +0200)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 23:08:54 +0000 (16:08 -0700)
commit8cc01e5...19e0dc9a86bba4cba414b46627fe0424
tree39fe301...91ff723b32fdfcb87d49c7ee1e10c6cacopy hash to clipboard (tree)
parent0bed189...8ae6c0cec1485e6295be16a4fcebc7a7copy hash to clipboard (diff)
git-merge.sh