unreadable characters in tortoisegitmerge window

[GoogleCodeExporter]

What steps will reproduce the problem?
1.modify a utf8 encoded text file with Chinese characters on two branches;
2.merge one branch to another;
3.resolve the conflicted text file with tortoisegitmerge

What is the expected output? What do you see instead?
expected:the 'merged' part of tortoisegitmerge window should display correct 
Chinese characters.
instead:it displays unreadable characters like question mark.

What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.14.0 (C:\Program Files\TortoiseGit\bin) 
git version 1.9.5.msysgit.1 (C:\Program Files (x86)\Git\bin) 

windows 8.1 x64

Please provide any additional information below.

Original issue reported on code.google.com by luweidon...@gmail.com on 6 May 2015 at 1:31

Attachments:

• 001.png

[GoogleCodeExporter]

That's normal workflow of conflict resolution.
The red region has conflict.
It is filled with full of question marks in red background,
no matter it contains Chinese characters or not.

Original comment by ch3co...@gmail.com on 6 May 2015 at 2:14

• Changed state: Invalid

[GoogleCodeExporter]

You may right click on the red region, and select the menu items to help you 
resolve conflicts.
If neither of them completely solve the conflicts, after choosing the nearest 
option,
you may edit the lines at the bottom pane.

Original comment by ch3co...@gmail.com on 6 May 2015 at 2:21

Attachments:

• TMergeConflict.png

[GoogleCodeExporter]

Thanks a lot. This solved my confusion

Original comment by luweidon...@gmail.com on 7 May 2015 at 12:53