Comment 8 for bug 489915

So the approach I am taking with this is to first add a mergetools module to bzrlib, which provides support for managing and invoking the user's configured merge tools. Then, change qconflicts to make use of this. A command line interface to invoking a merge tool could also be added to bzr.