Update git-imerge

Crash fixed on Windows with Python 2.7

```TypeError: environment can only contain strings```
Merge pull request #46 from KindDragon/patch-1

Only store strings in the environment.