projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3658768 adfd55d)
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)
* ar/merge-one-file-diag:
  Clarify kind of conflict in merge-one-file helper


Trivial merge
Git—the stupid content tracker