FormResolveConflicts show submodule hashes for merge conflicts
Issues fixed with conflicts in submodules

PatchProccessor support combined diff's
Support highlighting submodule hashes when use solving this submodule conflicts
Submodule conflict message changed to display current submodule hash
Merge remote-tracking branch 'gitextensions/master' into BuildServerIntegration