When merging or rebasing branches, add the option to interrupt the merge/rebase process with a conflict.

[rolandkrueger]

Just like a real Git repository, in case of a conflict, the repository should be in a MERGING or REBASE state. The current state should be shown in the branch label just like on the command line.