Resoving Conflicts in repo

[dariuszkowalski-com]

It would be fantastic to implement a way to manage conflicts in the repo. Now, when I am using a vault on two computers sometimes I need to resolve each conflict manually by the console.

The solution could be done by adding the possibility lu launch an external tool to do this.

[Vinzent03]

Why do you need the console? Because you want to find the conflict files? Because if you resolve the conflicts. A commit with the plugin should work then.