![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 22:44:43 +0000 (14:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 22:44:43 +0000 (14:44 -0800) | ||
| commit | 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e | |
| tree | 8bffa625a10a3e3e0e60db86ea5017565a1d99fd | tree | snapshot |
| parent | 684d0d8dcfa2288744a553fc7294c5f9f5c12026 | commit | diff |
| parent | ed87465658c83a5a1617920e7b605bd830a78aed | commit | diff |
Merge branch 'ap/maint-merge-strategy-list-fix'
| builtin-merge.c | diff1 | | diff2 | | blob | history |