Search found 1 match

by armel
Wed Oct 25, 2006 12:48 pm
Forum: Support (Vault)
Topic: Can't edit code in merge tool
Replies: 7
Views: 6231

another possibility

I would suggest ECMerge (it is a 3-way with in-line differences, you can edit the merged result in the bottom view and it is really affordable) it works great an Windows and Linux. the 2.0 beta is started and it supports in-line merge (for example, indentation / modifications merges are rather well ...