From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2009 02:01:59 +0000 (-0700)
Subject: Merge branch 'ar/merge-one-file-diag' into maint
X-Git-Tag: v1.6.3.2~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e82f625416702e3ce769bf2652b0031d9bf562d8;p=git.git

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

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

e82f625416702e3ce769bf2652b0031d9bf562d8