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 1292cafd7f1f7fc30b462d4e07be34383e9d6be9..497ef36ad883e79cd799a4642e0c4414d8550e1c 100755
(executable)
--- a/
t/t6022-merge-rename.sh
+++ b/
t/t6022-merge-rename.sh
@@
-105,6
+105,7
@@
test_expect_success 'pull renaming branch into unrenaming one' \
test_expect_success 'pull renaming branch into another renaming one' \
'
+ rm -f B
git reset --hard
git checkout red
git pull . white && {