![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 22:42:28 +0000 (14:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 22:42:28 +0000 (14:42 -0800) | ||
| commit | a689faeb5850174edfbbb0a502ef7eee8cd06d76 | |
| tree | c1ce351a69efce2b7c0a7a2773ffd934a9888e6f | tree | snapshot |
| parent | 1bab4bba5457bd55fc1c27ddc4218b4b375c8251 | commit | diff |
| parent | 79f7ca063d6b74e9d7f3db90c85dfa4a162128e4 | commit | diff |
Merge branch 'uk/maint-shortlog-encoding'
Conflicts:
builtin-shortlog.c
Conflicts:
builtin-shortlog.c
| builtin-shortlog.c | diff1 | | diff2 | | blob | history |