Conflict resolution

Conflicts were nightmare

 >>> YOUR VERSION
 ....
 === ORIGINAL VERSION x
 ....
 === THEIR VERSION x
 ....
 <<< THEIR VERSION y

Even there's only whitespace change!

The svk way:
 Conflict found on file boo:
 (d)iff, (t)heirs, (y)ours, (m)erge, (e)dit, (s)kip ? 

Actually we stole this from Perforce

Plus built-in support for 13 merge tools:

• AraxisMerge Emacs FileMerge GVim GtkDiff Guiffy KDiff3 Meld P4WinMerge TkDiff TortoiseMerge Vim XXDiff