Support highlighting submodule hashes when use solving this submodule conflicts
Submodule conflict message changed to display current submodule hash