![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Aug 2009 11:13:04 +0000 (04:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Aug 2009 11:13:04 +0000 (04:13 -0700) | ||
| commit | b21f9e7f860620571667fba33ed511bed59dfb14 | |
| tree | 1cb50257a9c0f179c88f81014064d079d5b416c8 | tree | snapshot |
| parent | 1d7d6ad539fabd49421d8ef7b27c0f287430bc7d | commit | diff |
| parent | 69a8b7c74192dfa7bde3937d2c84324a2cd1506b | commit | diff |
Merge branch 'jk/maint-merge-msg-fix'
* 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
| builtin-merge.c | diff1 | | diff2 | | blob | history |