Merge branch 'pt/git4win-mods' into pu

diff --git a/git-gui.sh b/git-gui.sh
index 2381c3e54807ecd0b326d8c11b3f0c6008c5636a..b097c8c9271115f5408c98411e588477985c5edb 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1620,11 +1620,13 @@ proc run_prepare_commit_msg_hook {} {
        if {[file isfile [gitdir MERGE_MSG]]} {
                set pcm_source "merge"
                set fd_mm [open [gitdir MERGE_MSG] r]
+               fconfigure $fd_mm -encoding utf-8
                puts -nonewline $fd_pcm [read $fd_mm]
                close $fd_mm
        } elseif {[file isfile [gitdir SQUASH_MSG]]} {
                set pcm_source "squash"
                set fd_sm [open [gitdir SQUASH_MSG] r]
+               fconfigure $fd_sm -encoding utf-8
                puts -nonewline $fd_pcm [read $fd_sm]
                close $fd_sm
        } else {