![[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) | ||
| commit | bd30037e65c53112dd84c2712750e152b2f7f854 | |
| tree | 3f3f9700cddc32d13a25d76fe6eb86a11ee67c93 | tree | snapshot |
| parent | 6b37b3d873e734919dfd43c3d124c4f98e265296 | commit | diff |
| parent | 69a8b7c74192dfa7bde3937d2c84324a2cd1506b | commit | diff |
Merge branch 'jk/maint-merge-msg-fix' into maint
* 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
* 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