Patch Set 3:

* I think the merge editor should be immediately be opened on the pre-selected first conflicting file instead of requiring a double click

Done.

    * also when navigating the list of files in the upped part this should automatically show the merge editor in the lower part

Not sure if this is at all possible

    * when selecting "show the version pre-merged by git" I would prefer if this would only affect the hunks which have been automatically merged by git without conflicts, the conflicting hunks should be displayed in the same way as when the other option "Use HEAD" is selected since the traditional format with the conflict markers redundantly shows both conflicting changes in the left pane. This is redundant in the merge tool since the other version being merged in and the base version are already displayed in the other panes of the merge tool.

Done.

    * when clicking "Copy current change from right to left" I would prefer if the change from the right would overwrite the change on the left instead of appending it. Same for "Copy all changes from right to left". Maybe we could have another action "Append change from right to left".

Not possible with this framework as far as I can say.