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)
commitfbe0b24...a53111208b8ecd920cc112d0be13f93c
tree81854df...fe2528bd4b332fc77d7ad28959d74220copy hash to clipboard (tree)
parentba1f5f3...3775ddbf97bc0d543888783630693023copy hash to clipboard (diff)
builtin-merge-file.c