diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-07-16 10:33:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 14:27:09 -0700 |
| commit | 01941bd54387aee029315d565f0bc1a5b9c5541a (patch) | |
| tree | 30edfa04139fdaf54692e312744dbaf36ab1f85c /builtin-merge-ours.c | |
| parent | f66cf96d7c613a8129436a5d76ef7b74ee302436 (diff) | |
| download | git-01941bd54387aee029315d565f0bc1a5b9c5541a.tar.gz | |
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>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions