diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2008-07-20 14:34:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-20 13:37:26 -0700 |
| commit | 74f5b7fba420eb6b807db48d0ee7a000202f8225 (patch) | |
| tree | 102b124ac549cac5ecdcac1d0efbacc298d21e7f /mktree.c | |
| parent | ec96224e215f1b2f143524afa339564271c11e12 (diff) | |
| download | git-74f5b7fba420eb6b807db48d0ee7a000202f8225.tar.gz git-74f5b7fba420eb6b807db48d0ee7a000202f8225.tar.xz | |
builtin-merge.c: Fix option parsing
Now "git merge -m" needs a message, and errors out with the usage
text if none is given.
This way, t7600-merge.sh is fixed.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mktree.c')
0 files changed, 0 insertions, 0 deletions