tree a9e9b864fb4bb051f87c6b0bb5985122b5dc1868
parent e036c90a913889dfa8097ebe73b619370e0c6f32
author Junio C Hamano <junkio@cox.net> 1166954393 -0800
committer Junio C Hamano <junkio@cox.net> 1166955537 -0800

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

People often get confused if the value of branch.*.merge should
be the remote branch name they are fetching from, or the
tracking branch they locally have.  So this allows either.

Signed-off-by: Junio C Hamano <junkio@cox.net>