diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-10-31 03:25:33 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 11:12:26 -0700 |
| commit | 501a75a7b308ed9631cd4802d891e6b56c06821a (patch) | |
| tree | 4a31a6825838654afca7a3e42ab828a97a4f7de5 /t/t4200-rerere.sh | |
| parent | 90f867b9a5088a2ea6f5844ae28b617821e77b28 (diff) | |
| download | git-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.gz git-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.xz | |
t: replace pulls with merges
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 7f6666fcd..cf19eb78a 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 |