WinMerge

Download Source Code

WinMerge is released under the GNU General Public License. That means you can get the whole source code and can build the program yourself.

42b68f643067e0a0ad0a58256b7640cd5f20a6ef WinMerge-2.14.0-src.zip
e6d36a9ec42bdca333d9f85c4801eef70816e129 WinMerge-2.14.0-src.7z

The source code is hosted on Bitbucket in a Mercurial repository.

Developer Version

https://bitbucket.org/winmerge/winmerge

WinMerge 2.14

https://bitbucket.org/winmerge/winmerge/branch/R2_14

Recent Code Changes

• - Fix warning C6054: String '...' might not be zero-terminated. - Fix warning C28183: '...' could be '0', and is a copy of the value found in '...' - Fix warning C6387: warning C6387: <argument> may be <value>: this does not adhere to the specification for the function <function name>: Lines: x, y 2018-06-17 09:04
• Merge 2018-06-17 04:57
• Merge pull request #89 from GreyMerlin/master Various, esp. Improve compare+display of last lines in files 2018-06-17 00:37
• Improve Options > Color > Differences dialog layout - Allow more room for the various lines of caption test by sliding the various controls slightly to the right. 2018-06-16 20:19
• Improve compare+display of last lines in files (2) Symptom ... An F5 Refresh could produce slightly different comparison results (near the end of the file) when input files did not have explicit EOL marking after the last line of the file. Discussion ... The original file compare window is generated directly from the original files. However, subsequent F5 Refresh displays are generated from temporary copies of the files that are made after they are read for the first time; these temporary files would **never** have EOL markings following the last line of the file - thus causing slightly different output. Solutions ... When making internal temporary copies of the original input files, a final EOL marking will be written to the temp file **if** the original file had a final EOL. 2018-06-16 20:16
• Improve compare+display of last lines in files (1) Symptoms ... ASSERT could occur (with Debug build), and possibly a fault could occur with Release builds, if longest file was the Left File and that file did not have an explicit EOL marking after the last line of the file, and there were visible differences at the very end of the file. Discussion ... The internal `m_ptBuf[]->m_aLines[]` buffers could end up with different numbers of line entries in situations where the last line of a file had no explicit EOL marking. Normally, the two (or three) `m_aLines[]` buffers would have "ghost" line entries to represent "missing" lines, so that all `m_aLines[]` buffers would be of the same length. The lack of a final EOL could confuse that logic. At some points in the comparison logic, the length used for processing the two (or three) buffers is determined simply by the length of `m_aLines[0]` Solution ... By the end of the `PrimeTextBuffers()` procedure, the two (or three) `m_ptBuf[]->m_aLines[]` buffers will now **always** have the same length. Furthermore, there will no longer be <null> entries at the end of the `m_aLines[]` arrays. These will now be deleted (if **all** `m_aLines[]` buffers have them), or they will be replaced with appropriate "ghost" lines (if only **some** of the buffers have final <null> entries) Also, a number of comments are improved. 2018-06-16 20:11
• Tweak "Fix alignment of the comboboxes in OpenDlg" - adjusted by 1 pixel for even better visual alignment 2018-06-16 19:03
• Adopt performance improvement from diffutils - include [commit ...414dc606]( http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=68b82f6f8419a815cfcf962b3061352d414dc606) from **diffutils** 2016-10-25 (ver 3.5) - this commit improves the performance of the TOO_EXPENSIVE optimization on "modern" processors (ca. 2016) by upgrading the minimum threshold of this optimization from 255 to 4096. 2018-06-16 18:59
• Improve interrelation with GNU diffutils source - Remove four *.c files never used by diffutils or WinMerge - Change `Src/CompareEngines/DiffUtils{.c|.h}` to be `./Wrap_DiffUtils{.c|.h}` to remove confusion about the **diffutils** name. These files are part of WinMerge, not GNU diffutils. - Change Solution Explorer to have the entry **GNU diffutils** rather than **DiffEngine** - Copy solution changes from VS2017 to VS2015 2018-06-16 18:49
• Fix compilation errors on the Test configuration 2018-06-16 13:29
• View code history…