Update git-imerge

Crash fixed on Windows with Python 2.7

```TypeError: environment can only contain strings```