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)
commita21455a...664c1a29c157e2bc5ea3abe8e2699eca
tree849957b...922b5521c8a241bf9d941143d75cdaeacopy hash to clipboard (tree)
parent3d092bf...6f2d9a998967979f926c661e9762601ccopy hash to clipboard (diff)
transport-helper.c