mhagger/git-imerge — pull request #46 by KindDragon (2014-02-05 14:35:15+00:00)
Title: Update git-imerge

Crash fixed on Windows with Python 2.7

```TypeError: environment can only contain strings```