diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 23:40:23 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-09-13 15:45:24 -0700 |
| commit | 0d214b6619bf14a6409a2a1ba079f3530d40ee41 (patch) | |
| tree | c66cfbe40dba9ed56ea2c87bc0cdd7f079da63f2 /object.h | |
| parent | [PATCH] Be more like the 'resolve' strategy. (diff) | |
| download | tgif-0d214b6619bf14a6409a2a1ba079f3530d40ee41.tar.xz | |
[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 'object.h')
0 files changed, 0 insertions, 0 deletions