diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2010-05-11 01:17:46 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-05-10 11:57:32 -0700 |
| commit | d4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746 (patch) | |
| tree | 684cf41e78cf12ee241c6571a8b0d19a5b89a759 /git-merge-resolve.sh | |
| parent | t7604-merge-custom-message: shift expected output creation (diff) | |
| download | tgif-d4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746.tar.xz | |
t7604-merge-custom-message: show that --log doesn't append to -m
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions