diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-18 20:01:11 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-18 20:01:11 +0400 |
| commit | d430262fac7b8804da491c23ac1726bed2b1326d (patch) | |
| tree | 35f0267f12def071aadef8de84e257f606794135 | |
| parent | 36587681b4743c980e4e74a342dc5ec105314d08 (diff) | |
| parent | adfd55d51bff3bfcf17c3cd40d0689fb018c14cf (diff) | |
Merge branch 'ar/merge-one-file-diag'
* ar/merge-one-file-diag:
Clarify kind of conflict in merge-one-file helper
0 files changed, 0 insertions, 0 deletions