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)
commitadfd55d...1bff3bfcf17c3cd40d0689fb018c14cf
tree57418b8...6ff1c1f05536f759c4845aad31cf5811copy hash to clipboard (tree)
parent6ffd567...ec439e7809ee0966556bd5e72fb78de4copy hash to clipboard (diff)
git-merge-one-file.sh