diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 21:40:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-13 22:45:24 (GMT) |
| commit | 0d214b6619bf14a6409a2a1ba079f3530d40ee41 (patch) | |
| tree | c66cfbe40dba9ed56ea2c87bc0cdd7f079da63f2 /patch-delta.c | |
| parent | d9a23fa6f7124befe7803f5f3a8c53999578caa4 (diff) | |
| download | git-0d214b6619bf14a6409a2a1ba079f3530d40ee41.zip git-0d214b6619bf14a6409a2a1ba079f3530d40ee41.tar.gz git-0d214b6619bf14a6409a2a1ba079f3530d40ee41.tar.bz2 | |
[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>
Diffstat (limited to 'patch-delta.c')
0 files changed, 0 insertions, 0 deletions