Merge branch 'ar/merge-one-file-diag'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 16:01:11 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 16:01:11 +0000 (09:01 -0700)
commitd430262fac7b8804da491c23ac1726bed2b1326d
tree35f0267f12def071aadef8de84e257f606794135
parent36587681b4743c980e4e74a342dc5ec105314d08
parentadfd55d51bff3bfcf17c3cd40d0689fb018c14cf
Merge branch 'ar/merge-one-file-diag'

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