![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 26 Dec 2006 02:08:01 +0000 (18:08 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 26 Dec 2006 02:08:01 +0000 (18:08 -0800) | ||
| commit | d2bafe5c320c1204b264dc25392a3fc35ed57153 | |
| tree | bcb53fc2d263302e05c50b3332adbedca562599e | tree | snapshot |
| parent | 6ec45f3bd180ed0404733d0f5c648691245cf571 | commit | diff |
| parent | 80c797764a6b6a373f0f1f47d7f56b0d950418a9 | commit | diff |
Merge branch 'jc/bm'
* jc/bm:
Allow branch.*.merge to talk about remote tracking branches.
* jc/bm:
Allow branch.*.merge to talk about remote tracking branches.