So after chatting with Gary and Lukas the consensus re qbzr's merge --qpreview is:
* teach bzrlib merge about `merge --preview --using XXX` where XXX could be qbzr * this would require to support `bzr diff --using qbzr` too.
Also we need "qpreview" option in qmerge in similar way to Diff button in several other dialogs (qlog/qcommit/qrevert).
So for qbzr 0.14 I'm planning to disable overloading merge command with --qpreview to unblock pipeline plugin.
So after chatting with Gary and Lukas the consensus re qbzr's merge --qpreview is:
* teach bzrlib merge about `merge --preview --using XXX` where XXX could be qbzr
* this would require to support `bzr diff --using qbzr` too.
Also we need "qpreview" option in qmerge in similar way to Diff button in several other dialogs (qlog/qcommit/ qrevert) .
So for qbzr 0.14 I'm planning to disable overloading merge command with --qpreview to unblock pipeline plugin.