I support integrating extmerge into qbzr, or atleast the functionality of it.
A registry of known 3way merge tools with their parameters makes sense, but we must still allow for unregistered merge tools to work without changing the qbzr code. Maybe we can choose a default order for the %o %b %t %r parameters.
I support integrating extmerge into qbzr, or atleast the functionality of it.
A registry of known 3way merge tools with their parameters makes sense, but we must still allow for unregistered merge tools to work without changing the qbzr code. Maybe we can choose a default order for the %o %b %t %r parameters.