summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-06 22:34:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-06 22:34:43 (GMT)
commit152a9c17a802379a3a48e025b74dedd76e2623cc (patch)
tree35adf01f3da51119a475392076d1cb290b800a00 /t/t4200-rerere.sh
parentf26f72de159d7ade2fbe8b48734ce98c1aba4d72 (diff)
parentabf03eeb8e99538cd31806d5f252214b9fe695a6 (diff)
downloadgit-152a9c17a802379a3a48e025b74dedd76e2623cc.zip
git-152a9c17a802379a3a48e025b74dedd76e2623cc.tar.gz
git-152a9c17a802379a3a48e025b74dedd76e2623cc.tar.bz2
Merge branch 'fc/trivial'
A random collection of style fixes and minor doc updates. * fc/trivial: setup: trivial style fixes run-command: trivial style fixes diff: trivial style fix revision: trivial style fixes pretty: trivial style fix describe: trivial style fixes transport-helper: trivial style fix sha1-name: trivial style cleanup branch: trivial style fix revision: add missing include doc/pull: clarify the illustrations t: replace pulls with merges merge: simplify ff-only option
Diffstat (limited to 't/t4200-rerere.sh')
-rwxr-xr-xt/t4200-rerere.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 076e770..ed9c91e 100755
--- 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