Michael Seibt

We could add one setting with a list of color values.

(Basically, the replacement of script options works kind of "inverse": If there is a typo or there is no valid replacement, the option is not replaced but provided as is...

I do not like the merge dialog very much either. Though it has a context menu and both dialogs can be closed and re-opened, i.e. you are not locked in....

> Having to press the "X" is a bit confusing. I agree, the similarity to "Abort" may confuse users. Perhaps we should reopen the discussion towards "Abort merge" & "Abort...

> Add option for autocontinue The existing option should suffice. Though we "just" need to detect that the conflicts have been resolved and to continue. 

`FormResolveConflicts._thereWhereMergeConflicts` might be the key. I have found it by searching for the option `AppSettings.DontConfirmCommitAfterConflictsResolved`.

In this callstack, this is a false error IIUIC. We should turn line 180 of `GetRevision(commitHash, ...)` into ``` if (commandOutput.Length == 0 || !TryParseRevision(commandOutput, out GitRevision? revision)) ``` (Sorry,...

`button.PerformClick()` or the like is used in the code base. If it is applicable here, it is worth a try. Yes, it is git who opens the editor for the...

> We should turn line 180 of `GetRevision(commitHash, ...)` into I have tried to do so and to setup a testcase. Does the requested revision exist? If not, the exit...

> > Does the requested revision exist? > > Sure. Then I guess `process.WaitForExit()` or the like is missing after `RunDetached`.