projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a2b1e53) | patch
t7601 (merge-pull-config): add missing &&
authorElijah Newren <newren@gmail.com>
Sun, 3 Oct 2010 20:00:11 +0000 (14:00 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Oct 2010 20:26:13 +0000 (13:26 -0700)
commitaf7b252619fd9f73ab6a06af09e7e62838c5f54b
treeb5d93cdf9db1344f7aacf79704bd89ca3d5d1188tree | snapshot
parenta2b1e53b94e99fa88394b1317be478d5c5d864dccommit | diff
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>
t/t7601-merge-pull-config.sh diff | blob | history
Git—the stupid content tracker