From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 6 Dec 2006 15:45:42 +0000 (+0100)
Subject: merge-file: support -p and -q; fix compile warnings
X-Git-Tag: v1.5.0-rc0~127^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbe0b24ca53111208b8ecd920cc112d0be13f93c?hp=fbe0b24ca53111208b8ecd920cc112d0be13f93c

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>
---