Re: [TSVN] Re: TortoiseMerge: Editing conflicts

Hughes, Bill wrote:
[snip]
> winmerge lets you edit the file (a bit) while merging two files. I seem to
> remember that winmerge is going to go three way, if it hasn't already.
> I downloaded the source code to these with an eye to sticking my favourite
> bits together but it's in my pending tray with hundreds of other useful bits
> I don't have time for.

I think if you don't write the three way part for WinMerge yourself and
send them your patch this won't happen anymore this decade.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org