On Wed, 28 Apr 2010 14:59:40 +0200 >>>>>> "Piotr" == Piotr Piastucki <leech miranda gmail com> wrote: Hello, Piotr> The following patch adds 3 new merge action to the context menu. Piotr> The actions work in 3-way diff mode only and they respectively Piotr> apply or merge all non-conflicting changes in one shot. Comments Piotr> appreciated. When speaking about 3-way diff/merge, I'd like to grab some attention to the old (almost 5yrs) feature request which has become re-opened in due course of time: https://bugzilla.gnome.org/show_bug.cgi?id=321290 Meld is very nice tool and supports many DVCS-s, but those need support for 3-way diff/merge. Any chance that Meld will add support for it? Sincerely, Gour -- Gour | Hlapicina, Croatia | GPG key: F96FF5F6 ----------------------------------------------------------------
Attachment:
signature.asc
Description: PGP signature