diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2009-04-30 01:40:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-09 11:27:39 +0400 |
| commit | 718135e3b6b5317f763477f5b0f408d888d79a8e (patch) | |
| tree | a4f09602d6c5e5511e220b3fdd4d2027d886fe3d /t | |
| parent | ac9f71cf766ab1affdfc4d4c4b58238bf9c76700 (diff) | |
Clarify kind of conflict in merge-one-file helper
Not as verbose as the recursive merge driver, but better still.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions