![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700) |
* ar/merge-one-file-diag:
Clarify kind of conflict in merge-one-file helper
Clarify kind of conflict in merge-one-file helper
Trivial merge