tree bcb53fc2d263302e05c50b3332adbedca562599e
parent 6ec45f3bd180ed0404733d0f5c648691245cf571
parent 80c797764a6b6a373f0f1f47d7f56b0d950418a9
author Junio C Hamano <junkio@cox.net> 1167098881 -0800
committer Junio C Hamano <junkio@cox.net> 1167098881 -0800

Merge branch 'jc/bm'

* jc/bm:
  Allow branch.*.merge to talk about remote tracking branches.