Enhanced the merge conflict dialog

[eonist]

• [ ] do the "git merge --abort" to revert to the state you were in before the merge attempt
• [ ] Improve the Conflict dialog, you need to inform how many conflicts we are talking about etc
• [ ] a way to step back and forth in the dialog

[eonist]

• [ ] To merge a local branch into another local branch:

The question here is how you refer to theirs and ours when choosing which file to use. Test this. Should be trivial to figure out.

test this, so you know