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

diff --cc builtin/fetch.c
Simple merge

diff --cc t/t5510-fetch.sh
Simple merge