Update git-imerge

Crash on rebase fixed (Windows, Python 2.7)