Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rev-list: disable object/refname ambiguity check with --stdin
[gitweb.git]
/
t
/
t4200-rerere.sh
diff --git
a/t/t4200-rerere.sh
b/t/t4200-rerere.sh
index 076e7709d2243bf3734a1e06ae94351dface230e..ed9c91e25b584c2241c238f9c6ffad9a3a327d2c 100755
(executable)
--- a/
t/t4200-rerere.sh
+++ b/
t/t4200-rerere.sh
@@
-172,7
+172,7
@@
test_expect_success 'first postimage wins' '
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
git commit -q -a -m third &&
- test_must_fail git
pull .
first &&
+ test_must_fail git
merge
first &&
# rerere kicked in
! grep "^=======\$" a1 &&
test_cmp expect a1