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)
* jc/bm:
  Allow branch.*.merge to talk about remote tracking branches.


Trivial merge