![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 6 Dec 2006 15:45:42 +0000 (16:45 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 18:04:00 +0000 (10:04 -0800) | ||
| commit | fbe0b24ca53111208b8ecd920cc112d0be13f93c | |
| tree | 81854df2fe2528bd4b332fc77d7ad28959d74220 | tree | snapshot |
| parent | ba1f5f353775ddbf97bc0d543888783630693023 | commit | diff |
merge-file: support -p and -q; fix compile warnings
Now merge-file also understands --stdout and --quiet options. While
at it, two compile warnings were fixed.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Now merge-file also understands --stdout and --quiet options. While
at it, two compile warnings were fixed.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| builtin-merge-file.c | diff | blob | history |