git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c5942d adfd55d)
Merge branch 'ar/merge-one-file-diag' into maint
authorJunio C Hamano <redacted>
Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700)
committerJunio C Hamano <redacted>
Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700)
* ar/merge-one-file-diag:
  Clarify kind of conflict in merge-one-file helper


Trivial merge
git clone https://git.99rst.org/PROJECT