![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700) |
* jk/maint-merge-msg-fix:
merge: indicate remote tracking branches in merge message
merge: fix incorrect merge message for ambiguous tag/branch
add tests for merge message headings
merge: indicate remote tracking branches in merge message
merge: fix incorrect merge message for ambiguous tag/branch
add tests for merge message headings
Trivial merge