| commit | adfd55d51bff3bfcf17c3cd40d0689fb018c14cf | |
| 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> | |
| Thu, 30 Apr 2009 01:38:52 +0000 (29 18:38 -0700) | ||
| tree | 57418b8e6ff1c1f05536f759c4845aad31cf5811 | treesnapshot (tar.gz zip) |
| parent | 6ffd567bec439e7809ee0966556bd5e72fb78de4 | 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 |