![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 20 Feb 2006 05:18:17 +0000 (21:18 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 20 Feb 2006 05:18:17 +0000 (21:18 -0800) | ||
| commit | 73be17f0b387b2741646498a9a80da677a9e0c7a | |
| tree | e5d845a0d0da8926a8370987b44ebb34f690c6f0 | tree | snapshot |
| parent | 1561a9b662bb4721e01654c44854efffa005169e | commit | diff |
| parent | a15f43312f6962959e8daa33df0cf5357852a4b8 | commit | diff |
Merge branch 'jc/merge-msg'
* jc/merge-msg:
fmt-merge-msg: do not add excess newline at the end.
fmt-merge-msg: say which branch things were merged into unless 'master'
* jc/merge-msg:
fmt-merge-msg: do not add excess newline at the end.
fmt-merge-msg: say which branch things were merged into unless 'master'