[PATCH] Don't output 'Automatic merge failed, ...'
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 21:40:23 +0000 (23:40 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 22:45:24 +0000 (15:45 -0700)
commit0d214b6...19bf14a6409a2a1ba079f3530d40ee41
treec66cfbe...0dba9ed56ea2c87bc0cdd7f079da63f2copy hash to clipboard (tree)
parentd9a23fa...f7124befe7803f5f3a8c53999578caa4copy hash to clipboard (diff)
git-merge-recursive.py