FormResolveConflicts: add Goto Help link
GotoUserManualControl: fix url generation
GitUI: make internals visible to the GitExtensionsTest project
Add unit test for GotoUserManualControl
GotoUserManualControl: fix GetUrl
Merge branch 'pr/n1854_feinstaub'

Conflicts:
	GitExtensionsTest