From mint-bounce@lists.fishpool.fi  Fri Jan  8 09:19:56 2010
MIME-Version: 1.0
X-Mailer: AfterLogic WebMail Pro PHP
X-Originating-IP: 217.40.83.198
X-Priority: 3 (Normal)
Message-ID: <ntqq1hs.4c5e1abe5d50057ea1888c3ca8131cbf@secure.freeola.com>
From: p.slegg@scubadivers.co.uk
Cc: mint@lists.fishpool.fi
Subject: Re: [MiNT] QED
Date: Fri, 8 Jan 2010 14:17:30 +0000 (GMT)
Content-Type: text/plain;
	charset="utf-8"
X-ecartis-version: Ecartis v1.0.0
Sender: mint-bounce@lists.fishpool.fi
Errors-to: mint-bounce@lists.fishpool.fi
X-original-sender: p.slegg@scubadivers.co.uk
Precedence: bulk
List-help: <mailto:ecartis@lists.fishpool.fi?Subject=help>
List-unsubscribe: <mailto:mint-request@lists.fishpool.fi?Subject=unsubscribe>
List-Id: <mint.lists.fishpool.fi>
X-List-ID: <mint.lists.fishpool.fi>
List-subscribe: <mailto:mint-request@lists.fishpool.fi?Subject=subscribe>
List-owner: <mailto:tjhukkan@fishpool.fi>
List-post: <mailto:mint@lists.fishpool.fi>
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from Quoted-Printable to 8bit by mail.sparemint.org id o08EJoaJ005283

>
>http://meld.sourceforge.net/meld_file1.png
>
>Like this.
>
>With IDEA it is very easy. When editing a module just a right click
>menu allows you to compare the local copy with the cvs HEAD or
>any version.
>
>Up pops another window like the one above showing the differences.
>It uses a system like the arrows in Meld between the columns to
>let the user push changes across into the local copy.
>
>The same sort of thing happens when doing an update of the local copy
>and there is a clash requiring a merge.
>
>Peter

The more I look at the those screen shots of Meld, the more it
looks like IDEA.

http://meld.sourceforge.net/meld_preview.png

That one particularly.