Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t4200: remove two unnecessary lines
[gitweb.git]
/
t
/
t4200-rerere.sh
diff --git
a/t/t4200-rerere.sh
b/t/t4200-rerere.sh
index b68ab11f2915789cd04ac6bd43363aeab2079198..504802c987f7dc644c63d0e0d0a41275b556d82a 100755
(executable)
--- a/
t/t4200-rerere.sh
+++ b/
t/t4200-rerere.sh
@@
-190,8
+190,6
@@
test_expect_success 'file2 added differently in two branches' '
git add file2 &&
git commit -m version2 &&
test_must_fail git merge fourth &&
- sha1=$(sed -e "s/ .*//" .git/MERGE_RR) &&
- rr=.git/rr-cache/$sha1 &&
echo Cello > file2 &&
git add file2 &&
git commit -m resolution