From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 May 2009 16:01:11 +0000 (-0700)
Subject: Merge branch 'ar/merge-one-file-diag'
X-Git-Tag: v1.6.4-rc0~155
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d430262fac7b8804da491c23ac1726bed2b1326d;p=git.git

Merge branch 'ar/merge-one-file-diag'

* ar/merge-one-file-diag:
  Clarify kind of conflict in merge-one-file helper
---

d430262fac7b8804da491c23ac1726bed2b1326d