diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-06 15:45:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 18:04:00 (GMT) |
| commit | fbe0b24ca53111208b8ecd920cc112d0be13f93c (patch) | |
| tree | 81854df2fe2528bd4b332fc77d7ad28959d74220 /merge-file.c | |
| parent | ba1f5f353775ddbf97bc0d543888783630693023 (diff) | |
| download | git-fbe0b24ca53111208b8ecd920cc112d0be13f93c.zip git-fbe0b24ca53111208b8ecd920cc112d0be13f93c.tar.gz git-fbe0b24ca53111208b8ecd920cc112d0be13f93c.tar.bz2 | |
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>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions