Andrew's git / gitweb.git / diff
?
merge-file: support -p and -q; fix compile warnings
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 6 Dec 2006 15:45:42 +0000 (16:45 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 18:04:00 +0000 (10:04 -0800)
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>
No differences found