diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 23:40:47 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-09-13 15:45:25 -0700 |
| commit | 87a71b65acc10c4879b13d2030185e5640a087cd (patch) | |
| tree | 54b59e2eb54ad90d7682b12f8474f5b10ac1eed9 /daemon.c | |
| parent | [PATCH] Don't output 'Automatic merge failed, ...' (diff) | |
| download | tgif-87a71b65acc10c4879b13d2030185e5640a087cd.tar.xz | |
[PATCH] Adjust git-merge-recursive.py for the new tool names.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions