WinMerge

ปกติจะใช้ Beyond Compare สำหรับ merge file บังเอิญผ่านไปเจอ WinMerge ซึ่งเป็น opensource ด้วย ไม่เลว



[quote]WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.

Visual differencing and merging of text files <LI>Flexible editor with syntax highlighting, line numbers and word-wrap <LI>Handles DOS, UNIX and MAC text file formats <LI>Unicode support <LI>Difference pane shows current difference in two vertical panes <LI>Location pane shows map of files compared <LI>Highlights differences inside lines in file compare <LI>Regular Expression based file filters in directory compare allow excluding and including items <LI>Moved lines detection in file compare <LI>Creates patch files <LI>Shell Integration (supports 64-bit Windows versions) <LI>Rudimentary Visual SourceSafe and Rational ClearCase integration <LI>Archive file support using 7-Zip <LI>Plugin support <LI>Localizable interface via resource DLL[/quote]










ไม่เลว ต้องลองใช้ดู

Links
http://winmerge.org/