New feature: merge one branch onto another

[mike-perdide]

[mike-perdide]

This calls for a new interface.

[mike-perdide]

Maybe not, we could use a context menu entry: "Merge this commit with" > Other_branch > {subset of commits}