diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-10-03 14:00:11 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:26:13 -0700 |
| commit | af7b252619fd9f73ab6a06af09e7e62838c5f54b (patch) | |
| tree | b5d93cdf9db1344f7aacf79704bd89ca3d5d1188 /xdiff | |
| parent | t7001 (mv): add missing && (diff) | |
| download | tgif-af7b252619fd9f73ab6a06af09e7e62838c5f54b.tar.xz | |
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>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions