Resolving conflicts with Bazaar Explorer
bialix at ukr.net
Thu Nov 26 17:34:27 GMT 2009
Philippe Lhoste пишет:
> On 26/11/2009 06:01, Alexander Belchenko wrote:
>> I don't like extmerge because it does not support WinMerge :-P
> Well, despite its name, WinMerge isn't really a merge tool (at least a
> 3-way merge tool), just a (good) diff tool.
> On my bazaar.conf file, I have the following incantation:
> external_merge = C:/Program Files/WinMerge/WinMergeU.exe %o %t %r
> (commented out) but TBH I don't recall if I really used it, because of
> above reason...
The command-line above does not work.
It should be
C:/Program Files/WinMerge/WinMergeU.exe %r
and this syntax does not supported neither by extmerge not by qconflicts.
Also I agree -- it's not 3way merge, but it's good enough to resolve
conflicts, and when you have relatively small display (not 21" ?) having
only 2 panes do help.
More information about the bazaar