Merge and visual merge

I'm getting around to adding the file level merge feature to QVCS-Enterprise. The goal is to make it drop-dead easy to use -- which can be a challenge for merge, especially when there are collisions... and I guess that's one of the things that has led me to put it off.

In any case, I've decided to go ahead, and already have a non-visual merge working. The non-visual merge works silently in the case where there are no overlaps, and fails (as it is supposed to!) in the case where there are any overlaps. The idea is that a visual merge will be required in the case where there are overlaps. A merge will only be attempted on a file that has a status of 'Merge Required'.

No predictions yet on how long it will take to complete... The non-visual merge went faster than I thought it might. I expect the visual merge will take a while longer, if only because it will require some usability after I get things roughed in.