Junio C Hamano schrieb: > <<<<<<< HEAD:foo > これはサイドブランチの変更です。 > やはり JIS コードで書いてます。 > ======= > 日本語のファイルです。 > JIS コードで書いてます。 >>>>>>>> master:foo > > The above will probably come out as UTF-8 in this mail text, but the point > is that the confict side markers do not have anything but filename and the > branch name. I am still scratching my head trying to see where in the > merge-recursive codepath you got snippet of log message. Try rebase -i instead of merge: This should put summary lines onto the conflict markers. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
