Andrew's git / gitweb.git / diff
?
Merge branch 'ar/merge-one-file-diag' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:01:59 +0000 (19:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
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