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.) - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
