Code

Merge branch 'ar/merge-one-file-diag' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700)
commite82f625416702e3ce769bf2652b0031d9bf562d8
tree38b103a22d51dc22835a06d375bab806c513acdb
parent2c5942dbae01e5c23d2b68aced019702eb256ad9
parentadfd55d51bff3bfcf17c3cd40d0689fb018c14cf
Merge branch 'ar/merge-one-file-diag' into maint

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