diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-06 16:45:42 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-06 10:04:00 -0800 |
| commit | fbe0b24ca53111208b8ecd920cc112d0be13f93c (patch) | |
| tree | 81854df2fe2528bd4b332fc77d7ad28959d74220 /xdiff | |
| parent | Add builtin merge-file, a minimal replacement for RCS merge (diff) | |
| download | tgif-fbe0b24ca53111208b8ecd920cc112d0be13f93c.tar.xz | |
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 'xdiff')
0 files changed, 0 insertions, 0 deletions