diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:28:57 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:28:57 +0100 |
| commit | 408c2120e02cf2a96cd44c69fe3baf406d4de157 (patch) | |
| tree | 39bbc79808622e6aa3a16f0437e2bc2b39881ec7 /git-gui.sh | |
| parent | 64c6b4c507c0295dbd54b0981510a5a8fff71947 (diff) | |
| parent | a0a0c6838744ce51bcbb634f459e173e8be59c22 (diff) | |
| download | git-408c2120e02cf2a96cd44c69fe3baf406d4de157.tar.xz | |
Merge branch 'patches' into pu
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 11048c7a0e..1ed51857e9 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1616,11 +1616,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 { |