| commit | 37ed12850578fbc951704932ca10159d0f87166f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Aug 2009 20:36:40 +0000 (9 13:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Aug 2009 20:36:40 +0000 (9 13:36 -0700) | ||
| tree | 40421102376e21d485340eb05d243e75a807e39e | treesnapshot (tar.gz zip) |
| parent | 090e65fdbc8d53104b9330d228e615ae34b04cf4 | commitdiff |
| parent | 69a8b7c74192dfa7bde3937d2c84324a2cd1506b | commitdiff |
Merge branch 'jk/maint-merge-msg-fix' into next
* 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 | blobhistory |