projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6ffd567) | patch
Clarify kind of conflict in merge-one-file helper
authorAlex Riesen <raa.lkml@gmail.com>
Wed, 29 Apr 2009 21:40:50 +0000 (23:40 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Apr 2009 01:38:52 +0000 (18:38 -0700)
commitadfd55d51bff3bfcf17c3cd40d0689fb018c14cf
tree57418b8e6ff1c1f05536f759c4845aad31cf5811tree | snapshot
parent6ffd567bec439e7809ee0966556bd5e72fb78de4commit | 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>
git-merge-one-file.sh diff | blob | history
Git—the stupid content tracker