Darcs

If there is a conflict, it is good to have a graphical view of the conflicting files and to have a possibility to resolve the conflict using graphical application. I have in my ~/.darcs/defaults:

ALL external-merge kdiff3 --output %o %a %1 %2

and whenever there is a conflict, it launches kdiff3 application, which will help with conflict resolution.