Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
builtin-grep: workaround for non GNU grep.
[gitweb.git]
/
t
/
t6022-merge-rename.sh
diff --git
a/t/t6022-merge-rename.sh
b/t/t6022-merge-rename.sh
index 1292cafd7f1f7fc30b462d4e07be34383e9d6be9..a2d24b5ca95d971eccbb913c2a0eb84b7e87cd10 100755
(executable)
--- a/
t/t6022-merge-rename.sh
+++ b/
t/t6022-merge-rename.sh
@@
-3,6
+3,12
@@
test_description='Merge-recursive merging renames'
. ./test-lib.sh
+if test "$no_python"; then
+ echo "Skipping: no python => no recursive merge"
+ test_done
+ exit 0
+fi
+
test_expect_success setup \
'
cat >A <<\EOF &&