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

• Merge pull request #93 from GreyMerlin/master "Ghost Lines" at the end of file comparisons. 2018-08-04 16:15
• Reduce Level 4 Build Warnings (12) * I must have missed these three Level 4 Warning situations in the earlier Pull. * They are only generated when building the Test configuration for the Win32 platform. 2018-08-03 15:32
• Last Line of Files vs "Ghost Lines" (4) Re-implements the Undo handling for the last line (see my final comments in the earlier "...Ghost Lines (2)" commit) to move the "Ghost" sensitive parts out of the `CCrystalTextBuffer` class and into the `GhostTextBuffer` class. A new virtual procedure `UndoInsert()`now exists in both `CCrystalTextBuffer` and `GhostTextBuffer`, with the WinMerge and Ghost specific checking in the `GhostTextBuffer`class, and the basic deletion code in the `CCrystalTextBuffer`class. Also, modify the `VERIFY()`testing in the Undo paths to correctly interface with the general failure mechanism within `Undo()` 2018-08-03 15:13
• Last Line of Files vs "Ghost Lines" (3) `LineInfo::Delete()` was not correctly handling the case of deleting all text in a line _including_ the CRLF at the end. This particular situation exists because of deleting text at the very end of a file. 2018-08-02 18:10
• Last Line of Files vs "Ghost Lines" (2) Handle the special case of `Undo()` at the very end of a file. `Undo()` checks that the text that is being replaced in the file matches the records being kept in the `m_aUndoBuf[]` structure. The deletion of text at very end of the file necessary involves removing an additional CRLF (because of an LF_GHOST line which was removed too) which causes this Undo comparison-checking to fail. Following failure, and only if the failure is at the very end of the file, a new secondary check is made to check for the deletion of the additional CRLF. I don't particularly like this code because it puts knowledge of "Ghost" lines directly into the code of the `CCrystalTextBuffer` class. A subsequent patch will factor this into virtual procedures shared with the `CGhostTextBuffer` class. 2018-08-02 18:06
• Last Line of files vs "Ghost Lines" (1) The special case of inserting text into the very last line of a file when that last line is marked as LF_GHOST. Effectively, the new text is supposed to go "before" the Ghost, but mechanically the text is inserted into the Ghost itself, with a new Ghost line appearing at the end of the file. Later, the Ghost status of both the first and last inserted lines will get straightened out, with the trailing Ghost line becoming a NULL line. By setting the last line to NULL, the line will eventually be removed or become an actual LF_GHOST line in `CMergeDoc::PrimeTextBuffers()` 2018-08-02 15:42
• Improve comments relating to "ghost buffers" (2) * continuing from earlier commit 2018-08-02 15:39
• Improve Various ASSERTs related to "Ghost Buffers" 2018-08-02 14:01
• Enable `checkFlagsFromReality()` Debug checking 2018-08-02 13:39
• Improve comments relating to "ghost buffers" * Correct and extend various parameter comments, esp. for Doxygen * Make sure default parameter values in a function definition are properly commented in the function declaration as well * Add either `/*virtual base*/` or `/*virtual override*/` comments to various "ghost buffer " related procedure declarations. * Eliminate (using `#if 0` and `#endif`) the procedures `InternalInsertGhostLine()` and `InsertGhostLine()` 2018-08-02 13:35
• View code history…