index 262381379f247a74f1656cfdd7f9b0c6d386d372..0ab14a6e81302db6a1239d68270ab909cb2fd216 100755 (executable)
#
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
#
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
-# nice decription of what this is about.
+# nice description of what this is about.
test_description='Test criss-cross merge'
. ./test-lib.sh
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
test_expect_success 'prepare repository' \
'echo "1
2
7
8
9" > file &&
7
8
9" > file &&
-git add file &&
+git add file &&
git commit -m "Initial commit" file &&
git branch A &&
git branch B &&
git commit -m "Initial commit" file &&
git branch A &&
git branch B &&