transport-helper: mismerge fix
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:36:29 +0000 (03:36 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Oct 2013 18:16:40 +0000 (11:16 -0700)
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.

Reported-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found