projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 0d214b6)
[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)
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>

No differences found
The core git plumbing