| commit | 718135e3b6b5317f763477f5b0f408d888d79a8e | |
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Wed, 29 Apr 2009 21:40:50 +0000 (29 23:40 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 May 2009 07:27:39 +0000 (9 00:27 -0700) | ||
| tree | a4f09602d6c5e5511e220b3fdd4d2027d886fe3d | treesnapshot (tar.gz zip) |
| parent | ac9f71cf766ab1affdfc4d4c4b58238bf9c76700 | commitdiff |
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>
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>
| git-merge-one-file.sh | diffblobblamehistory |