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/t9114-git-svn-dcommit-merge.sh
View File

@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '
echo friend > README &&
cat tmp >> README &&
git commit -a -m "friend" &&
git pull . merge
git merge merge
'
test_debug 'gitk --all & sleep 1'