mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t: replace pulls with merges

Browse Source 
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>
This commit is contained in:
Felipe Contreras
2013-10-31 03:25:33 -06:00
committed by Junio C Hamano
parent 90f867b9a5
commit 501a75a7b3
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/annotate-tests.sh
View File

@ -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' '