git-merge, win-iconv