![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Tue, 13 Sep 2005 21:40:23 +0000 (23:40 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 13 Sep 2005 22:45:24 +0000 (15:45 -0700) | ||
| commit | 0d214b6619bf14a6409a2a1ba079f3530d40ee41 | |
| tree | c66cfbe40dba9ed56ea2c87bc0cdd7f079da63f2 | tree | snapshot |
| parent | d9a23fa6f7124befe7803f5f3a8c53999578caa4 | commit | diff |
[PATCH] Don't output 'Automatic merge failed, ...'
git-merge.sh does this for us.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh does this for us.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diff | blob | history |