Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Output also empty patches in "commitdiff" view
[gitweb.git]
/
t
/
t6022-merge-rename.sh
diff --git
a/t/t6022-merge-rename.sh
b/t/t6022-merge-rename.sh
index 5ac25647abd366f04867a5acec6a987f314c2ace..497ef36ad883e79cd799a4642e0c4414d8550e1c 100755
(executable)
--- a/
t/t6022-merge-rename.sh
+++ b/
t/t6022-merge-rename.sh
@@
-3,12
+3,6
@@
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 &&