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

Submodule GitExtensionsTest:
    > 48dd549 - Corrected encodings.
    > 7399c9a - comparing text without encoding
    > d3e6614 - removing lossless encoding, using UTF8
    > 1500d2e - Removing unnecessary small.patch file, moving creation of small patch to a method, using losslessEncoding
    > 04de8d1 - Adding back TestPatch
    > 185cb25 - Remove unused debug statement
    > 63ce1f1 - Loading patch from expectedPatch
    > 079abdc - Revert "Ignoring Translation test for mono"
    > b383614 - Ignoring Translation test for mono
    > 231d828 - Correcting TestContext not implemented in mono
    > 744b284 - Increasing tests for PatchManager
FormSettings: show Discard button only in Debug mode. Update hint text.
FormSettings: fix minor "jumping" of button row when hint text appears or disappears
Merge pull request #1859 from feinstaub/fix_remove_discard_button

FormSettings: show Discard button only in Debug mode