Skip to content

Commit

Permalink
Merge branch 'ar/merge-one-file-diag'
Browse files Browse the repository at this point in the history 
* ar/merge-one-file-diag:
  Clarify kind of conflict in merge-one-file helper
  • Loading branch information
Junio C Hamano committed May 18, 2009
2 parents 3658768 + adfd55d commit d430262
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit d430262

Please sign in to comment.