<html><head><style type="text/css"></style></head><body><div style="font-family:times new roman,new york,times,serif;font-size:12pt"><div>WinMerge works ok for what I am trying to do, but I was hoping whether I could just integrate it with TBzr/QBzr. I dont understand what I am missing when I tried to add WinMerge as external diff application. The commandline I used seems to work.<br><br>How do you use extmerge if you just want to see the diff of a file with history? How do I specify in extmerge to use WinMerge as one of the primary option?<br><br>Niben<br></div><div style="font-family: times new roman,new york,times,serif; font-size: 12pt;"><br><div style="font-family: times new roman,new york,times,serif; font-size: 12pt;"><font size="2" face="Tahoma"><hr size="1"><b><span style="font-weight: bold;">From:</span></b> "martitzam@gmail.com" <martitzam@gmail.com><br><b><span style="font-weight: bold;">To:</span></b> Niben M Singh <niben_s@rocketmail.com><br><b><span style="font-weight: bold;">Cc:</span></b> Bazaar <bazaar@lists.canonical.com><br><b><span style="font-weight: bold;">Sent:</span></b> Saturday, May 2, 2009 1:32:26 PM<br><b><span style="font-weight: bold;">Subject:</span></b> Re: Using Winmerge with TortoiseBzr<br></font><br> <br><br><div class="gmail_quote">On Sat, May 2, 2009 at 7:28 AM, Niben M Singh <span dir="ltr"><niben_s@rocketmail.com></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div><div style="font-family: times new roman,new york,times,serif; font-size: 12pt;"><div>I see that the plugin is only for Linux or Mac. Is it? Could you give more information? Is ext-merge as good as winmerge?<br><br>Niben<br></div></div></div></blockquote><div><br>The extmerge is a plugin for bzr.  It is written in python and works on Windows.<br><br>fwiw, I use BeyondCompare version 3 for both diff (using an alias) and 3-way conflict resolution (using extmerge).  BC3 is a <b>very</b> powerful tool and is probably more than most people need.  Our integration manager loves it and so do I.  We use only on windows but it is also available for some versions of linux now.<br><br>-M<br><br></div></div><br> </div></div></div><br> </body></html>