Optimize resolving submodule conflict process

https://code.google.com/p/tortoisegit/issues/detail?id=2330