| commit | af7b252619fd9f73ab6a06af09e7e62838c5f54b | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 3 Oct 2010 20:00:11 +0000 (3 14:00 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Oct 2010 20:26:13 +0000 (6 13:26 -0700) | ||
| tree | b5d93cdf9db1344f7aacf79704bd89ca3d5d1188 | treesnapshot (tar.gz zip) |
| parent | a2b1e53b94e99fa88394b1317be478d5c5d864dc | commitdiff |
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>
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 | diffblobblamehistory |