Merge branch 'jc/bm'
authorJunio C Hamano <junkio@cox.net>
Tue, 26 Dec 2006 02:08:01 +0000 (18:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 26 Dec 2006 02:08:01 +0000 (18:08 -0800)
commitd2bafe5c320c1204b264dc25392a3fc35ed57153
treebcb53fc2d263302e05c50b3332adbedca562599e
parent6ec45f3bd180ed0404733d0f5c648691245cf571
parent80c797764a6b6a373f0f1f47d7f56b0d950418a9
Merge branch 'jc/bm'

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