git4idea: encoding bugfix
commit96b9bb4a598a0c923ec83738ac1d48dd46691600
authorConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Wed, 28 Jan 2009 17:02:33 +0000 (28 20:02 +0300)
committerConstantine Plotnikov <Constantine.Plotnikov@jetbrains.com>
Wed, 28 Jan 2009 17:02:33 +0000 (28 20:02 +0300)
tree1eeaac2daa129ce9eac478f868490da9925c6398
parent80bd6b915e788fea7941153f38aa33ac0f97f444
git4idea: encoding bugfix
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java