![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Sixt <johannes.sixt@telecom.at> | |
| Wed, 16 Jul 2008 08:33:52 +0000 (10:33 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jul 2008 21:27:09 +0000 (14:27 -0700) | ||
| commit | 01941bd54387aee029315d565f0bc1a5b9c5541a | |
| tree | 30edfa04139fdaf54692e312744dbaf36ab1f85c | tree | snapshot |
| parent | f66cf96d7c613a8129436a5d76ef7b74ee302436 | commit | diff |
t7600-merge: Use test_expect_failure to test option parsing
It used plain 'if git merge ...', which hides a segfault. The test does not pass.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It used plain 'if git merge ...', which hides a segfault. The test does not pass.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7600-merge.sh | diff | blob | history |