Good free or paid merge software that edits two similar files?

Un bel giorno Weng Tianxiang digit�:

> I wonder if there is better merge software better than WinMerge, free
> or paid?

The best I've ever tried is Araxis Merge (definitely not free).

-- 
asd

Hi,
Now I have several options: (I don't care if it is free or paid,
because it is a company project, not personal one). The drawback of
WinMerge is its search function incompleteness during two file
comparison: During two file comparison, what I want most is a function
that uses two user-defined fast keys to search forth and back for
keyword different appearances and to find their differences between 2
versions. With WinMerge, there is no fast key definition for search.
When entering Ctrl+F, it pops a window to search for. If one is found,
you must enter Ctrl+F again to search next, ...

For example, if I define F3 key is to search forward, F4 key is to
search backward. After first highlighting a keyword, then pressing F3,
it would go to next key word appearance, or pressing F4, it would go to
next keyword appearance backward. Their implementation is not
difficult, but greatly reduce the timing to do search.

To relieve my pressure, can you please tell me whether or not the tools
you suggested and preferred have the functions?

Thank you.

Weng


AxisCompare, Compare,

Hi all,

I use KDiff (http://kdiff3.sourceforge.net/). It's free and very useful
(you can ignore case, space for instance). You can compare/merge file
and directory.

Regards

Marcus Harnisch a =E9crit :

> Weng,
>
> I guess nobody has mentioned (X)Emacs+Ediff yet. It makes only sense
> with text-based files of course.
>
> One highlight worth mentioning is the ability to take full advantage
> of the editing capabilities and syntax highlighting (as well as email,
> news-reading, doctor...) of (X)Emacs.
>=20
> -- Marcus

I would highly recommend the *free*, multi-OS Perforce Visual Merge
Tool (P4Merge -- http://www.perforce.com/perforce/products/merge.html)
This is a true three-way merge tool, which is what you want when you
are doing multi-user code development.

You give the tool two or three versions of the code.  Two-way merge is
exactly as with any other tool.  However, it's three way merge where
P4Merge really shines.  You supply the "Base", "Left", and "Right"
files to it.  The Base is the file you started with before making your
changes.  Left is your file.  And Right is the other file someone else
has created -- they've made changes (starting from base) at the same
time as you were making your changes.  It will then do a correct merge,
and it does an excellent job flagging conflicts.

This is the tool many of ourdevelopers use for merging, and in my
experience, it is signficantly better (fewer mistakes, better conflict
identification) than many other tools.

Regards,

Paul Leventis
Altera Corp.

Hi Paul,
I will try P4Merge.

Thank you for your suggestion.

Weng

Weng Tianxiang wrote:
> Hi,
> Recently I am asked to update several my projects. A lot of works has
> to be made, comparing old code and new code and replace old one with
> new one.
>
> I found that WinMerge is of great value in this respect. I would like
> to thank those people who developed the free software to let me use it
> and dramatically to increase my job efficiency and reliability.
>
> Thank you, WinMerge software designer.
>
> I wonder if there is better merge software better than WinMerge, free
> or paid?
>
> If you know, please let me know.
>
> Weng

I use Multi-Edit (not free) for editing and comparing text files.  It
is excellent for both purposes.

Charles