diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-10-31 10:25:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 19:12:26 +0100 |
| commit | 501a75a7b308ed9631cd4802d891e6b56c06821a (patch) | |
| tree | 4a31a6825838654afca7a3e42ab828a97a4f7de5 /t/annotate-tests.sh | |
| parent | merge: simplify ff-only option (diff) | |
| download | git-501a75a7b308ed9631cd4802d891e6b56c06821a.tar.xz git-501a75a7b308ed9631cd4802d891e6b56c06821a.zip | |
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/annotate-tests.sh')
| -rw-r--r-- | t/annotate-tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 99caa42f5c..c9d105d707 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -92,7 +92,7 @@ test_expect_success 'blame 2 authors + 1 branch2 author' ' ' test_expect_success 'merge branch1 & branch2' ' - git pull . branch1 + git merge branch1 ' test_expect_success 'blame 2 authors + 2 merged-in authors' ' |