Elijah Newren af7b252619 t7601 (merge-pull-config): add missing && ...

Also prefix several relevant git merge commands with 'test_must_fail' to
keep the tests passing.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-10-06 13:26:13 -07:00

3.6 KiB

Executable File

Raw Blame History

View Raw