[Gmo]

For me, it also hangs each time I have to resolve a conflict (I use an external tool for resolution, don't know if it's the reason)