kaisellgren/Git-GUI — Issue #37: Implement visual conflict resolving tool
Author: kaisellgren
Created: 2011-11-27 15:18:45+00:00
State: open

We should implement our own visual conflict resolving tool.

Another option (or addition) could be to have bundled tools like kdiff3, etc. that we just ```exec```.

It would be neat to have our own great tool, however.