Hi, Git merge conflict will insert '<<< first line of commit log message' '===' '>>>' markers to the text file that is causing a conflict. Unfortunately, the encoding of the text file may be different from the log message encoding, and that results in a file which has a mixed encoding (which is pretty hard to edit from any editor BTW). My use case is editing platex files (iso-2022-jp encoded) with log messages of utf-8. http://git.debian.org/?p=tokyodebian/monthly-report.git;a=summary ... Thinking about it, it's probably the same encoding problem as git blame. Is there already a good way to fix this or is this something that needs fixing? regards, junichi -- dancer@{netfort.gr.jp,debian.org} -- 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
