projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/git/gitweb
[git.git]
/
t
/
t6022-merge-rename.sh
diff --git
a/t/t6022-merge-rename.sh
b/t/t6022-merge-rename.sh
index
a2d24b5
..
5ac2564
100755
(executable)
--- a/
t/t6022-merge-rename.sh
+++ b/
t/t6022-merge-rename.sh
@@
-111,6
+111,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 && {