Skip to content

Commit

Permalink
Merge branch 'ar/merge-one-file-diag' into maint
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 26, 2009
2 parents 2c5942d + adfd55d commit e82f625
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit e82f625

Please sign in to comment.