Comment 5 for bug 174509

Revision history for this message
Alexander Belchenko (bialix) wrote : Re: qcommit: Add a list of conflicts and an option to launch a merge tool to resolve them

Gary, this looks like a good plan.