From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Sep 2010 16:17:00 +0000 (-0700)
Subject: Merge branch 'bc/maint-fetch-url-only'
X-Git-Tag: v1.7.3-rc1~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e250c5914fd151caf228cbda6c30560c266bcfef;p=git.git

Merge branch 'bc/maint-fetch-url-only'

* bc/maint-fetch-url-only:
  builtin/fetch.c: ignore merge config when not fetching from branch's remote
  t/t5510: demonstrate failure to fetch when current branch has merge ref
---

e250c5914fd151caf228cbda6c30560c266bcfef