Revert "Allow branch.*.merge to talk about remote tracking branches."