diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:52:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:52:18 -0800 |
| commit | 664368886781b7c070233c002597b84628eec571 (patch) | |
| tree | 2cb6cf87bdb0ca4ecfe8487cf4fef71fd26e8197 /t/t6021-merge-criss-cross.sh | |
| parent | 83f50539a9b1f18ccf0a4e1b84169eb4a24b3ea4 (diff) | |
| parent | abb7c7b31c0896bd838bbb6437b310db5a42227a (diff) | |
| download | git-664368886781b7c070233c002597b84628eec571.tar.gz git-664368886781b7c070233c002597b84628eec571.tar.xz | |
Merge part of jc/portable branch
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
| -rwxr-xr-x | t/t6021-merge-criss-cross.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index e8606c751..262381379 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -10,6 +10,12 @@ test_description='Test criss-cross merge' . ./test-lib.sh +if test "$no_python"; then + echo "Skipping: no python => no recursive merge" + test_done + exit 0 +fi + test_expect_success 'prepare repository' \ 'echo "1 2 |