From: Alan Hadsell Date: Tue, 09 Oct 2007 14:21:27 GMT Subject: Re: [PATCH] mergetool: add support for ECMerge Message-ID: <2b3a6fcd0710090721p28891ec0r5f385ff6fd1465c4@mail.gmail.com> In-Reply-To: <236E44B5-361E-4CE3-8C3D-BDAD0569642E@zib.de> Steffen Prohaska writes: > WinMerge doesn't support 3-way merges. At least I cannot find any > indication for 3-way in the manual [1] and the comparison at [2] also > tells that WinMerge doesn't support 3-way. >From their FAQ: Does WinMerge support merging three files? Sometimes it is called 3-way merge, where one file is ancestor. This would be useful for version control! Unfortunately not. We acknowledge it would be good feature but have no plans to implement it in near future. This can be somewhat worked around by using two WinMerge instances. (One developer has begun preliminary work on this feature, but it is not yet available, even in experimental releases.)