From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 16:34:48 +0000 (-0700)
Subject: Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'
X-Git-Tag: v1.8.3-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/41ae34d136e623cb4a6c6096d905dc648daabfb9?hp=41ae34d136e623cb4a6c6096d905dc648daabfb9

Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'

Update a test to match the documented interaction between pushURL
and pushInsteadOf.

* jc/t5516-pushInsteadOf-vs-pushURL:
t5516: test interaction between pushURL and pushInsteadOf correctly
---