diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-26 06:01:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-26 06:01:59 +0400 |
| commit | e82f625416702e3ce769bf2652b0031d9bf562d8 (patch) | |
| tree | 38b103a22d51dc22835a06d375bab806c513acdb | |
| parent | 2c5942dbae01e5c23d2b68aced019702eb256ad9 (diff) | |
| parent | adfd55d51bff3bfcf17c3cd40d0689fb018c14cf (diff) | |
Merge branch 'ar/merge-one-file-diag' into maint
* ar/merge-one-file-diag:
Clarify kind of conflict in merge-one-file helper
0 files changed, 0 insertions, 0 deletions