diff options
| author |  Samuel Tardieu <sam@rfc1149.net> | 2008-11-05 00:20:36 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-11-04 15:46:47 -0800 |
| commit | e0e03a731b2d06f42e79a2ff156ef9bd0e5c6c02 (patch) | |
| tree | 7ee475df96b8f281df6caef529d9dfef545eea36 /Documentation/git-merge.txt | |
| parent | tag: Check that options are only allowed in the appropriate mode (diff) | |
| download | tgif-e0e03a731b2d06f42e79a2ff156ef9bd0e5c6c02.tar.xz | |
tag: Add more tests about mixing incompatible modes and options
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions