t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
authorElijah Newren <newren@gmail.com>
Sun, 3 Oct 2010 20:00:02 +0000 (14:00 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Oct 2010 20:26:11 +0000 (13:26 -0700)
commit315e76540baa8b2c1887ea1ee0827dcbcda3e267
tree911730d2f0de4133115fc89e226754b0d62be704
parentdd0c69e95638d49f576c3774b8073b68d82ec0ff
t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&

Also, replace "|| return 1" with "&&" in order to keep commands chained.

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>
t/t1001-read-tree-m-2way.sh
t/t1002-read-tree-m-u-2way.sh