]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7600-merge.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f66cf96) | patch
t7600-merge: Use test_expect_failure to test option parsing
authorJohannes Sixt <johannes.sixt@telecom.at>
Wed, 16 Jul 2008 08:33:52 +0000 (10:33 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2008 21:27:09 +0000 (14:27 -0700)
commit01941bd54387aee029315d565f0bc1a5b9c5541a
tree30edfa04139fdaf54692e312744dbaf36ab1f85ctree | snapshot
parentf66cf96d7c613a8129436a5d76ef7b74ee302436commit | 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>
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.