Difference between revisions of "WinMerge"
Jump to navigation
Jump to search
Robinrichm (talk | contribs) (added Beyond Compare to the Related Links section) |
|||
| (8 intermediate revisions by 3 users not shown) | |||
| Line 1: | Line 1: | ||
| − | [http://winmerge.org/ WinMerge]is an Open Source (GPL) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions. | + | {| |
| + | |[[File:20080723165738.jpg]] | ||
| + | | | ||
| + | *[http://winmerge.org/ WinMerge]is an Open Source (GPL) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions. | ||
| + | |} | ||
| − | == User Related feedback == | + | == Features == |
| + | :*Visual differencing and merging of text files | ||
| + | :*Flexible editor with syntax highlighting, line numbers and word-wrap | ||
| + | :*Handles DOS, UNIX and MAC text file formats | ||
| + | :*Unicode support | ||
| + | :*Difference pane shows current difference in two vertical panes | ||
| + | :*Location pane shows map of files compared | ||
| + | :*Highlights differences inside lines in file compare | ||
| + | :*Regular Expression based file filters in directory compare allow excluding and including items | ||
| + | :*Moved lines detection in file compare | ||
| + | :*Creates patch files | ||
| + | :*Resolve conflict files | ||
| + | :*Shell Integration (supports 64-bit Windows versions) | ||
| + | :*Rudimentary Visual SourceSafe and Rational ClearCase integration | ||
| + | :*Archive file support using 7-Zip | ||
| + | :*Plugin support | ||
| + | :*Localizable interface | ||
| + | :*[http://winmerge.org/2.8/manual/index.html Online manual] and installed HTML Help manual | ||
| + | == TNG User Related feedback == | ||
*I downloaded and used this utility today and highly recommend it! [[User:Bgaugler|Bgaugler]] 00:43, 4 July 2008 (CDT) | *I downloaded and used this utility today and highly recommend it! [[User:Bgaugler|Bgaugler]] 00:43, 4 July 2008 (CDT) | ||
| + | *I used this utility a lot to rework my TNG user mods. Very highly recommend it! [[User:Ken Roy|Ken Roy]] 14:41, 4 July 2008 (CDT) | ||
| − | + | == Related Links == | |
| + | * [[BeyondCompare]] - a more powerful file and folder comparison tool, but it isn't free. It does, however, have a use-limited free version. | ||
| + | * [[TextWrangler]] for Macintosh | ||
[[Category:Software]] | [[Category:Software]] | ||
Latest revision as of 12:08, 2 October 2018
|
|
Features
- Visual differencing and merging of text files
- Flexible editor with syntax highlighting, line numbers and word-wrap
- Handles DOS, UNIX and MAC text file formats
- Unicode support
- Difference pane shows current difference in two vertical panes
- Location pane shows map of files compared
- Highlights differences inside lines in file compare
- Regular Expression based file filters in directory compare allow excluding and including items
- Moved lines detection in file compare
- Creates patch files
- Resolve conflict files
- Shell Integration (supports 64-bit Windows versions)
- Rudimentary Visual SourceSafe and Rational ClearCase integration
- Archive file support using 7-Zip
- Plugin support
- Localizable interface
- Online manual and installed HTML Help manual
TNG User Related feedback
- I downloaded and used this utility today and highly recommend it! Bgaugler 00:43, 4 July 2008 (CDT)
- I used this utility a lot to rework my TNG user mods. Very highly recommend it! Ken Roy 14:41, 4 July 2008 (CDT)
Related Links
- BeyondCompare - a more powerful file and folder comparison tool, but it isn't free. It does, however, have a use-limited free version.
- TextWrangler for Macintosh
