Allow NUL and \.\NUL in paths specified as command line arguments
+(PR #2056)
+
Added "(F4)" to the description of the toolbar icon "Difference in
+the Current Line". (#2050)
+
Fix a crash problem when the Diff algorithm is set to something
+other than default and one file does not have an EOL of the last line
+and the other file has an EOL of the last line.
+
+
Image compare
+
+
BugFix: Fixed the issue where .png is added when saving even if the
+file format does not use a converter such as jpg or png file.
+
+
Folder compare
+
+
BugFix: Folder compare omits unique folders from results if they
+contain any files and/or subfolders folder compare/merge (#2046)
+
+
Line filters
+
+
Modify the "Line Filters" dialog. (PR #2047)
+
+
Substitution filters
+
+
Modify the "Substitution Filters" dialog. (PR #2068)
+
+
Translations
+
+
Translation updates:
+
+
French (PR #2055,#2058)
+
Korean (PR #2057,#2059,#2060)
+
+
+
Internals
+
+
Small code changes for CMDIChildWnd handling (#2043)
+
WinMerge 2.16.33 - 2023-09-20
General
-
Reduce startup time and decrease the usage of Win32 user objects.
+
Reduce startup time and decrease the usage of Win32 user
+objects.
-
File compare
+
File compare
BugFix: Cannot compare one-line file (#1972)
-
BugFix: "Current Difference" specified by double-clicking cannot merge using the "Copy to Right (or Left)" menu. (#1980)
-
BugFix: Wimerge saves changes to the wrong file (#1985) (PR #1988)
-
BugFix: "Ignore comment differences" still compares inline comments (#2008)
+
BugFix: "Current Difference" specified by double-clicking cannot
+merge using the "Copy to Right (or Left)" menu. (#1980)
+
BugFix: Wimerge saves changes to the wrong file (#1985) (PR
+#1988)
+
BugFix: "Ignore comment differences" still compares inline comments
+(#2008)
[Feature Request] Both Shell Menu (#1986) (PR #2021)
Table compare
-
When "Use First Line as Header" is enabled, make the header display the first line regardless of the scroll position when the first line is hidden.
-
Generate reports in tabular format for table comparisons. (PR #1983)
+
When "Use First Line as Header" is enabled, make the header display
+the first line regardless of the scroll position when the first line is
+hidden.
+
Generate reports in tabular format for table comparisons. (PR
+#1983)
-
Folder compare
+
Folder compare
-
BugFix: Fixed an issue where Differences, Left/Right EOL columns, etc. were displayed as undefined values when the file comparison method was Full Contents or Quick Contents and the file size exceeded 64MB.
-
BugFix: Fix the problem that when comparing with the BinaryContents compare method, the contents of the files are identical, but if one side is a symbolic link, it is judged to be different. (#1976)
-
BugFix: Fixed an issue where values in the Left/Right EOL column may not display correctly when using the Quick contents compare method.
+
BugFix: Fixed an issue where Differences, Left/Right EOL columns,
+etc. were displayed as undefined values when the file comparison method
+was Full Contents or Quick Contents and the file size exceeded
+64MB.
+
BugFix: Fix the problem that when comparing with the BinaryContents
+compare method, the contents of the files are identical, but if one side
+is a symbolic link, it is judged to be different. (#1976)
+
BugFix: Fixed an issue where values in the Left/Right EOL column may
+not display correctly when using the Quick contents compare method.
Add Expand Different Subfolders menu item (#1382) (PR #1964)
-
Allow Diff algorithms (patience, histogram) other than default to be applied to folder comparisons (PR #2015) (#2002)
-
Show confirmation message when closing a window that took a long time to compare folders
+
Allow Diff algorithms (patience, histogram) other than default to be
+applied to folder comparisons (PR #2015) (#2002)
+
Show confirmation message when closing a window that took a long
+time to compare folders
-
Line filters
+
Line filters
-
Improve line filters and substitution filters (PR #2032) (#796) (#1620)
+
Improve line filters and substitution filters (PR #2032) (#796)
+(#1620)
-
Substitution filters
+
Substitution filters
-
Avoid infinite loops in the RegularExpression::subst() function when the length of the string matching the pattern is 0
-
Improve line filters and substitution filters (PR #2032) (#796) (#1620)
+
Avoid infinite loops in the RegularExpression::subst() function when
+the length of the string matching the pattern is 0
+
Improve line filters and substitution filters (PR #2032) (#796)
+(#1620)
Options dialog
-
Execute the "pause" command to prevent the error message from disappearing if the registration of the ShellExtension for Windows 11 fails
+
Execute the "pause" command to prevent the error message from
+disappearing if the registration of the ShellExtension for Windows 11
+fails
Plugins
-
BugFix: WinMerge cannot successfully disable some of its Plugins (#2012)
+
BugFix: WinMerge cannot successfully disable some of its Plugins
+(#2012)
Update jq to version 1.7
Manual
Manual: Use po4a for manual translation (PR #1994) (#499)
-
Translations
+
Translations
Translation updates:
@@ -89,25 +158,29 @@
Translations
Ukrainian (PR #1955)
-
Internals
+
Internals
Optimize inserts in std containers using reserve (PR #2000)
WinMerge 2.16.32 - 2023-07-27
General
-
BugFix: Export/Import settings bug with Substitution Filters (#1925)
+
BugFix: Export/Import settings bug with Substitution Filters
+(#1925)
-
File compare
+
File compare
-
BugFix: Save function doesn't work if the path length exceeds 248 characters (#1923)
-
BugFix: Redundant confirmation "The selected files are identical" (#1902)
+
BugFix: Save function doesn't work if the path length exceeds 248
+characters (#1923)
+
BugFix: Redundant confirmation "The selected files are identical"
+(#1902)
BugFix: Treeview scrolls to the wrong position. (#1915)
-
Allow changing the number of CPU cores to use while doing folder comparison (PR #1945)
+
Allow changing the number of CPU cores to use while doing folder
+comparison (PR #1945)
Webpage compare
@@ -115,13 +188,15 @@
Webpage compare
Command line
-
Compare folders recursively if "Include subfolders" is checked in the Options dialog even if the /r command line option is not specified. (PR #1914)
+
Compare folders recursively if "Include subfolders" is checked in
+the Options dialog even if the /r command line option is not specified.
+(PR #1914)
Archive support
Update 7-Zip to 23.01 (PR #1913)
-
Translations
+
Translations
New translation: Tamil (PR #1946)
Translation updates:
@@ -144,14 +219,15 @@
General
Add tasks to Jump List (PR #1828)
Update DirCmpReport.cpp (PR #1892)
-
File compare
+
File compare
-
BugFix: Fix input range check processing in "Go to" dialog. (PR #1826)
+
BugFix: Fix input range check processing in "Go to" dialog. (PR
+#1826)
BugFix: End of line diff is a bit wanky (#1838, PR #1849)
Confirm copy all in file merge (PR #1827)
Modify the "Go to" dialog. (PR #1896)
-
Folder compare
+
Folder compare
BugFix: Display problem with Item totals : (#1840)
BugFix: Bug in ignore whitespace ? (#1882)
@@ -166,7 +242,7 @@
Installer
Silent install blocked (#1852)
-
Translations
+
Translations
Translation updates:
@@ -190,20 +266,25 @@
Translations
WinMerge 2.16.30 - 2023-04-27
General
-
BugFix: When using an ini file all differences are displayed as black sections (#1799)
+
BugFix: When using an ini file all differences are displayed as
+black sections (#1799)
Reduced file size of WinMergeU.exe for 32-bit version
-
File compare
+
File compare
-
BugFix: Fixed an issue where XML format files, such as vcxproj, were not being syntax highlighted.
-
BugFix: Fixed an issue where the EOL character was not being displayed in the ARM64 version.
+
BugFix: Fixed an issue where XML format files, such as vcxproj, were
+not being syntax highlighted.
+
BugFix: Fixed an issue where the EOL character was not being
+displayed in the ARM64 version.
Modify the "Go to" dialog. (PR #1779)
-
Image compare
+
Image compare
BugFix: Middle Click to close image tab crash (#1785)
-
BugFix: Fixed an issue where the changed Color distance threshold value would revert back to 0 the next time WinMerge was started.
-
Image compare: Increase color distance threshold (CD Threshold) (winmerge/winimerge #29)
+
BugFix: Fixed an issue where the changed Color distance threshold
+value would revert back to 0 the next time WinMerge was started.
+
Image compare: Increase color distance threshold (CD Threshold)
+(winmerge/winimerge #29)
Filters
@@ -211,30 +292,40 @@
Filters
Options dialog
-
BugFix: Fixed an issue where the shell integration category page in the Options dialog was not displaying correctly in version 2.16.29.
-
BugFix: Fixed an issue where plugin settings were not exported when exporting from the Options dialog.
+
BugFix: Fixed an issue where the shell integration category page in
+the Options dialog was not displaying correctly in version 2.16.29.
+
BugFix: Fixed an issue where plugin settings were not exported when
+exporting from the Options dialog.
Plugins
-
BugFix: Fixed an issue where the ApplyPatch plugin was not functioning correctly when the 'Plugins -> Manual Unpacking' menu item was checked.
-
BugFix: Fixed the problem that the plug-in setting window cannot be opened on 32-bit OS
+
BugFix: Fixed an issue where the ApplyPatch plugin was not
+functioning correctly when the 'Plugins -> Manual Unpacking' menu
+item was checked.
+
BugFix: Fixed the problem that the plug-in setting window cannot be
+opened on 32-bit OS
Added a "Plugin Settings" button to the "Select Plugin" window.
-
Make the plugin settings dialog translatable and enable saving settings to an INI file (PR #1783)
+
Make the plugin settings dialog translatable and enable saving
+settings to an INI file (PR #1783)
Command line
-
BugFix: Fixed the problem that the /fr option is ignored when specifying the command line option /new
-
BugFix: Fixed the problem of not moving to the conflicted line after auto-merge.
+
BugFix: Fixed the problem that the /fr option is ignored when
+specifying the command line option /new
+
BugFix: Fixed the problem of not moving to the conflicted line after
+auto-merge.
Project file
-
BugFix: Opening a project fails when a path has environmental variables in it. (#1793)
+
BugFix: Opening a project fails when a path has environmental
+variables in it. (#1793)
Installer
-
BugFix: Unsuccessful installation, Portable Win32 version (#1802)
+
BugFix: Unsuccessful installation, Portable Win32 version
+(#1802)
-
Translations
+
Translations
Translation updates:
@@ -251,46 +342,61 @@
Translations
WinMerge 2.16.29 - 2023-03-21
-
File compare
+
File compare
-
BugFix: 3-way compare does not properly align identical lines when resolving conflicts, and show false highlights (#1696)
+
BugFix: 3-way compare does not properly align identical lines when
+resolving conflicts, and show false highlights (#1696)
BugFix: Failure to indent lines properly (#1740)
BugFix: Fixed problems with non-default Diff algorithm:
-
Even though the Ignore carriage return differences option was disabled, EOL differences were ignored when the option to ignore whitespace differences was enabled.
-
Differences between CR and CR+LF were not ignored even though Ignore carriage return differences option was enabled.
+
Even though the Ignore carriage return differences option was
+disabled, EOL differences were ignored when the option to ignore
+whitespace differences was enabled.
+
Differences between CR and CR+LF were not ignored even though Ignore
+carriage return differences option was enabled.
-
BugFix: Fixed a bug with Match whole word only options of Substitution filters
+
BugFix: Fixed a bug with Match whole word only options of
+Substitution filters
Add MATLAB syntax highlighting. (PR #1766)
Table compare
-
The "View > Wrap Lines" menu item in the Table Compare window is now "Wrap Text" and its check status is saved separately from the same menu item in the Text Compare window. (osdn #47553)
-
Added an option to change the CSV file separator from comma to semicolon or another character.
+
The "View > Wrap Lines" menu item in the Table Compare window is
+now "Wrap Text" and its check status is saved separately from the same
+menu item in the Text Compare window. (osdn #47553)
+
Added an option to change the CSV file separator from comma to
+semicolon or another character.
Binary compare
-
BugFix: Resizing WinMerge Window looses the correct scroll position for the memory address your cursor is at (WinMerge/frhed #13)
-
BugFix: Fixed an issue where an infinite loop occurred when the file size was truncated during file loading.
+
BugFix: Resizing WinMerge Window looses the correct scroll position
+for the memory address your cursor is at (WinMerge/frhed #13)
+
BugFix: Fixed an issue where an infinite loop occurred when the file
+size was truncated during file loading.
-
Image compare
+
Image compare
-
BugFix: Fixed issue preventing saving image comparison reports to a network share
+
BugFix: Fixed issue preventing saving image comparison reports to a
+network share
Webpage compare
BugFix: Fixed issue with missing file path in header bar
-
Folder compare
+
Folder compare
-
BugFix: After I collapse a folder, the arrow next to it stays turned down (#1747)
-
BugFix: Fixed an issue where the Left/Right Date and Left/Right Size columns would not update when deleting files on one side.
-
Implement issue #1413: "Move" needs options "Left to Right" or "Right to Left" like "Copy" (PR #1732,#1720)
+
BugFix: After I collapse a folder, the arrow next to it stays turned
+down (#1747)
+
BugFix: Fixed an issue where the Left/Right Date and Left/Right Size
+columns would not update when deleting files on one side.
+
Implement issue #1413: "Move" needs options "Left to Right" or
+"Right to Left" like "Copy" (PR #1732,#1720)
Pressing F2 or Rename should not select file extension (#1735)
Options dialog
-
Added Enable Compare As menu option in Shell integration category
+
Added Enable Compare As menu option in Shell integration
+category
Plugins
@@ -298,24 +404,33 @@
Plugins
Command line
-
BugFix: Fixed a crash that occurred when comparing alternate data streams, such as file.zip:Zone.Identifier:$DATA, using the /self-compare command line option.
-
BugFix: Fixed a crash that occurred when the /t command line option was specified with only one path provided
+
BugFix: Fixed a crash that occurred when comparing alternate data
+streams, such as file.zip:Zone.Identifier:$DATA, using the /self-compare
+command line option.
+
BugFix: Fixed a crash that occurred when the /t command line option
+was specified with only one path provided
Shell extension
-
BugFix: Windows 11 Tabs - wrong folder selected from new menu (#1733)
-
BugFix: Fixed the issue where the WinMerge menu would not appear when right-clicking on a non-item area in Windows 11 Explorer.
+
BugFix: Windows 11 Tabs - wrong folder selected from new menu
+(#1733)
+
BugFix: Fixed the issue where the WinMerge menu would not appear
+when right-clicking on a non-item area in Windows 11 Explorer.
Added Compare As menu item
Installer
-
Installer: components step unclear about "Patch GnuWin32" (#1698)
-
The ShellExtension*.dll file is now renamed before installation to prevent installation failure when Explorer is loading ShellExtension*.dll.
+
Installer: components step unclear about "Patch GnuWin32"
+(#1698)
+
The ShellExtension*.dll file is now renamed before installation to
+prevent installation failure when Explorer is loading
+ShellExtension*.dll.
Added IgnoreLeadingLineNumbers plugin to non-x86 installers
-
Translations
+
Translations
-
BugFix: Fix an issue where some messages are not translated. (PR #1712)
+
BugFix: Fix an issue where some messages are not translated. (PR
+#1712)
Translation updates:
Brazilian (PR #1711,#1713,#1727,#1728,#1756)
@@ -334,34 +449,43 @@
Translations
WinMerge 2.16.28 - 2023-02-15
-
Folder compare
+
Folder compare
-
BugFix: Fixed an issue where files with no extension were not compared if they were in a folder with a '.' in the folder name.
+
BugFix: Fixed an issue where files with no extension were not
+compared if they were in a folder with a '.' in the folder name.
WinMerge 2.16.26 - 2023-01-27
General
-
Fixed issue where the program would crash when certain path names were set in the file path bar.
+
Fixed issue where the program would crash when certain path names
+were set in the file path bar.
-
File compare
+
File compare
-
Feature request: Allow pasting when editing caption of pages (PR #1651)
+
Feature request: Allow pasting when editing caption of pages (PR
+#1651)
-
Folder compare
+
Folder compare
BugFix: Filters aren't saved anywhere (#1638)
-
BugFix: Fixed issue where the Open menu item in file path bar of folder comparison window was disabled.
-
Add processing to indicate that two directories are identical in the "Comparison result" column when they are identical in a 3-way folder comparison. (PR #1649)
-
Request: highlight the file after opening its parent folder (#1662)
+
BugFix: Fixed issue where the Open menu item in file path bar of
+folder comparison window was disabled.
+
Add processing to indicate that two directories are identical in the
+"Comparison result" column when they are identical in a 3-way folder
+comparison. (PR #1649)
+
Request: highlight the file after opening its parent folder
+(#1662)
Show/hide directories in 3-way comparison (PR #1683)
Binary compare
-
BugFix: Fixed issue where the Open menu item in file path bar of binary comparison window was disabled.
+
BugFix: Fixed issue where the Open menu item in file path bar of
+binary comparison window was disabled.
Webpage compare
-
BugFix: Deleted color of Word Difference in Options dialog was not used.
+
BugFix: Deleted color of Word Difference in Options dialog was not
+used.
Implemented Ignore numbers comparison option.
Options dialog
@@ -372,11 +496,13 @@
Plugins
Add PreviewMarkdown plugin (PR #1641)
Add PreviewPlantUML plugin (PR #1666)
-
CompareMSExcelFiles: Added "Compare worksheets as HTML" in CompareMSExcelFiles plugin options window
+
CompareMSExcelFiles: Added "Compare worksheets as HTML" in
+CompareMSExcelFiles plugin options window
ApacheTika: Updated Apache Tika to version 2.6.0
-
ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be downloaded and used.
+
ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be
+downloaded and used.
-
Translations
+
Translations
Translation updates:
@@ -396,36 +522,47 @@
Translations
WinMerge 2.16.25 - 2022-12-27
-
File compare
+
File compare
-
BugFix: Selection in "Replace" by regular expression doesn't work with \n (#1556)
-
BugFix: WinMerge hangs for a certain regex search & replace action for clearing all lines not containing '%' (#1575)
+
BugFix: Selection in "Replace" by regular expression doesn't work
+with \n (#1556)
+
BugFix: WinMerge hangs for a certain regex search & replace
+action for clearing all lines not containing '%' (#1575)
Add html5 keywords to crystaledit (PR #1565)
Add css keywords to crystaledit (PR #1572)
-
Preliminary exit (performance optimization) for Scrollbars calculation (PR #1574, #1573)
-
Fix issue #1583 Syntax highlighting for SQL leaves many things out. (PR #1591, #1583)
+
Preliminary exit (performance optimization) for Scrollbars
+calculation (PR #1574, #1573)
+
Fix issue #1583 Syntax highlighting for SQL leaves many things out.
+(PR #1591, #1583)
Starting Pane Consistency (#1598)
Binary compare
BugFix: Crash 0xc0000409 (#1544)
-
Binary compare: Allow 64bit versions to open files larger than 2GB (PR #1549)
+
Binary compare: Allow 64bit versions to open files larger than 2GB
+(PR #1549)
-
Folder compare
+
Folder compare
-
BugFix: Fix the problem that WinMerge crashes when pressing the "OK" button in the "Display Columns" dialog in the debug version. (PR #1568)
+
BugFix: Fix the problem that WinMerge crashes when pressing the "OK"
+button in the "Display Columns" dialog in the debug version. (PR
+#1568)
BugFix: Crash when copying files/folders (#1558)
BugFix: File Duplication Bug In Outputted Zips (#1588)
-
BugFix: Fixed problem with scrolling to unexpected position when expanding folders (osdn.net #46061)
-
BugFix: Fixed incorrect links to files with # in filename in folder comparison report (osdn.net #46082)
-
Changes the display processing of the "Comparison result" column for a 3-way folder comparison. (PR #1545)
-
Add "Copy All Displayed Columns" to the context menu of the folder compare window. (PR #1615)
+
BugFix: Fixed problem with scrolling to unexpected position when
+expanding folders (osdn.net #46061)
+
BugFix: Fixed incorrect links to files with # in filename in folder
+comparison report (osdn.net #46082)
+
Changes the display processing of the "Comparison result" column for
+a 3-way folder comparison. (PR #1545)
+
Add "Copy All Displayed Columns" to the context menu of the folder
+compare window. (PR #1615)
BugFix: Fixed crash when displaying file menu if jump list contains invalid title (osdn.net #45916)
+
BugFix: Fixed crash when displaying file menu if jump list contains
+invalid title (osdn.net #45916)
-
File compare
+
File compare
-
Changed operation of displaying dialogs and context menus from status bar from double-click to single-click.
+
Changed operation of displaying dialogs and context menus from
+status bar from double-click to single-click.
Table compare
-
BugFix: when TSV files were displayed in table mode with word wrap enabled, clicking on a character would not move the caret to that character's position
+
BugFix: when TSV files were displayed in table mode with word wrap
+enabled, clicking on a character would not move the caret to that
+character's position
-
Folder compare
+
Folder compare
-
Fixed memory leak in folder comparison when PDF files were targeted for image comparison.
+
Fixed memory leak in folder comparison when PDF files were targeted
+for image comparison.
Options dialog
Improved translation regarding CPU cores (PR #1513)
-
Select Files or Folders dialog
+
Select Files or Folders
+dialog
Made it possible to specify Prediffer plugin
Plugins
-
BugFix: Select Plugin dialog: Fixed that "Display all plugins" checkbox did not work
+
BugFix: Select Plugin dialog: Fixed that "Display all plugins"
+checkbox did not work
Project file
-
BugFix: Fixed comparison failure when left file path and right file path in project file are URLs.
+
BugFix: Fixed comparison failure when left file path and right file
+path in project file are URLs.
Allow saving following in project file.
Description
@@ -499,11 +646,14 @@
Project file
Patch Generator dialog
-
BugFix: The command line section in the generated patch file was garbled (osdn.net #45935)
+
BugFix: The command line section in the generated patch file was
+garbled (osdn.net #45935)
-
Translations
+
Translations
-
BugFix: Fix an issue where the following message displayed when two files are identical in a 3-way folder comparison is not translated. (PR #1535)
+
BugFix: Fix an issue where the following message displayed when two
+files are identical in a 3-way folder comparison is not translated. (PR
+#1535)
Translation updates:
Brazilian (PR #1511,#1523)
@@ -527,40 +677,52 @@
Others
WinMerge 2.16.23 - 2022-09-26
General
-
BugFix: Fix an issue where filenames containing "&" are not displayed properly in the MDI tab bar and its tooltips. (PR #1466)
+
BugFix: Fix an issue where filenames containing "&" are not
+displayed properly in the MDI tab bar and its tooltips. (PR #1466)
Color schemes
Create Midnight.ini (PR #1430)
-
File compare
+
File compare
-
BugFix: Non existing backup directory should be automatically created (#1438)
-
BugFix: Bug: Can't copy selected text, if it has non-changed lines (#1507)
+
BugFix: Non existing backup directory should be automatically
+created (#1438)
+
BugFix: Bug: Can't copy selected text, if it has non-changed lines
+(#1507)
Remember zoom level for all files (#1433)
-
The feature will allow the user to right-click the selected lines and… add them to Line Filter so that those lines added to the Line Filter will be ignored if found in any file. (PR #1481)
+
The feature will allow the user to right-click the selected lines
+and… add them to Line Filter so that those lines added to the Line
+Filter will be ignored if found in any file. (PR #1481)
CrystalEdit/parsers/SQL: Added more keywords (PR #1493)
Table compare
-
Bugfix: Inline differences ware not displayed even if the caret is moved to the position of an inline difference that is hidden due to the narrow column width.
+
Bugfix: Inline differences ware not displayed even if the caret is
+moved to the position of an inline difference that is hidden due to the
+narrow column width.
BugFix: Disable rename operations when in read-only mode in the folder compare window. (PR #1434)
-
BugFix: Fix an issue where renaming to a file name or directory name containing "" or "/" is not done properly. (PR #1451)
-
BugFix: Fix "Left to Right" and "Right to Left" copying in 2-way folder comparison. (PR #1495)
-
BugFix: Folder compare with jpg images crashes (#1176) (Previous versions were linked with unfixed freeimage.)
+
BugFix: Disable rename operations when in read-only mode in the
+folder compare window. (PR #1434)
+
BugFix: Fix an issue where renaming to a file name or directory name
+containing "" or "/" is not done properly. (PR #1451)
+
BugFix: Fix "Left to Right" and "Right to Left" copying in 2-way
+folder comparison. (PR #1495)
+
BugFix: Folder compare with jpg images crashes (#1176) (Previous
+versions were linked with unfixed freeimage.)
Archive support
Update 7-Zip to 22.01 (#1425)
-
Translations
+
Translations
Translation updates:
@@ -585,24 +747,33 @@
General
Allow renaming of untitled pages (#1395)
-
File compare
+
File compare
-
BugFix: "Replace All" doesn't work when Replace in "Selection" and the new string contains the old string. (#1376)
+
BugFix: "Replace All" doesn't work when Replace in "Selection" and
+the new string contains the old string. (#1376)
BugFix: “Match case” in Search always enabled (#1380)
BugFix: vertical editing for .h file is quite slow (#1386)
-
BugFix: replace text using regular expressions behaves incorrectly if multiple matches on the same line (#1387, PR #1388)
+
BugFix: replace text using regular expressions behaves incorrectly
+if multiple matches on the same line (#1387, PR #1388)
Optimize snake function (PR #1411)
-
Folder compare
+
Folder compare
-
BugFix: Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (PR #1372)
-
BugFix: Fix renaming process in folder compare window. (PR #1392)
-
BugFix: Elapsed time was no longer displayed in the status bar after folder comparison.
-
BugFix: Fix an issue where the folder column is not updated for child items after renaming a directory in the folder compare window. (PR #1408)
+
BugFix: Fix an issue where paths with different case are not
+displayed correctly in the folder column of the folder compare window
+when comparing three directories. (PR #1372)
+
BugFix: Fix renaming process in folder compare window. (PR
+#1392)
+
BugFix: Elapsed time was no longer displayed in the status bar after
+folder comparison.
+
BugFix: Fix an issue where the folder column is not updated for
+child items after renaming a directory in the folder compare window. (PR
+#1408)
Add a feature to save/restore hidden items to/from a project file.(PR #1377)
+
Add a feature to save/restore hidden items to/from a project
+file.(PR #1377)
Options dialog
-
New setting to decide when to save/restore hidden items when project is saved/loaded (PR #1377)
+
New setting to decide when to save/restore hidden items when project
+is saved/loaded (PR #1377)
-
Translations
+
Translations
Translation updates:
@@ -631,56 +804,75 @@
Translations
Portuguese (PR #1416)
-
Internals
+
Internals
Fix typo in SuperComboBox.cpp (PR #1379)
WinMerge 2.16.21 - 2022-06-20
General
-
In windows 11 i have error 78 sidebyside with the winmerge manifest (#1312)
+
In windows 11 i have error 78 sidebyside with the winmerge manifest
+(#1312)
-
File compare
+
File compare
BugFix: Copy left/right different behavior (#1334)
-
BugFix: Line difference coloring in “Word-level” mode does not work correctly for Cyrillic-based languages (#1362)
+
BugFix: Line difference coloring in “Word-level” mode does not work
+correctly for Cyrillic-based languages (#1362)
BugFix: Syntax highlighting: SQL comments (#1354)
-
Request for updating code: a new language(ABAP) in "syntax highlighting" (PR #1340)
+
Request for updating code: a new language(ABAP) in "syntax
+highlighting" (PR #1340)
Added "none" diff algorithm
Enable mouse wheel scrolling on the location pane.
-
Backup files: Misleading error message when file cannot be written (#1326)
+
Backup files: Misleading error message when file cannot be written
+(#1326)
Binary compare
Allow the "Split Vertically" menu item to be unchecked.
-
Image compare
+
Image compare
-
BugFix: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.
+
BugFix: Fix an issue where the pane was split vertically the next
+time the window was displayed, even though the "Split Vertically" menu
+item was unchecked.
Make patience and histogram diff algorithm selectable.
Webpage compare
-
BugFix: Fix text disappearing when pressing the 'K' key in the address bar
-
BugFix: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.
-
ResourceTree compare: Set the last-modified date and time in resource files
+
BugFix: Fix text disappearing when pressing the 'K' key in the
+address bar
+
BugFix: Fix an issue where the pane was split vertically the next
+time the window was displayed, even though the "Split Vertically" menu
+item was unchecked.
+
ResourceTree compare: Set the last-modified date and time in
+resource files
Added Ctrl+L keyboard shortcut
-
Folder compare
+
Folder compare
-
BugFix: Alt/Shift key highlighting issue not resetting start point from move. (#1335)
-
BugFix: Refresh Selected Marks Unscanned Folders as Identical (#1349)
-
BugFix: Make the file name refreshed to detect case changes when running "Refresh Selected". (PR #1358)
-
BugFix: Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (PR #1372)
+
BugFix: Alt/Shift key highlighting issue not resetting start point
+from move. (#1335)
+
BugFix: Refresh Selected Marks Unscanned Folders as Identical
+(#1349)
+
BugFix: Make the file name refreshed to detect case changes when
+running "Refresh Selected". (PR #1358)
+
BugFix: Fix an issue where paths with different case are not
+displayed correctly in the folder column of the folder compare window
+when comparing three directories. (PR #1372)
Tab behaviour on comparisons of files vs folders (#1367)
-
Make the sort order of file names including numbers the same as Explorer. (osdn.net #44557)
+
Make the sort order of file names including numbers the same as
+Explorer. (osdn.net #44557)
Reports
BugFix: Fix report generation process. (PR #1324)
-
BugFix: Fix report generation process about replacement with HTML entity (PR #1344)
-
Modify "Tools - Generate Report" (Add column width definition to html output) (PR #1333)
-
BugFix: Fix an issue where WinMerge crashes depending on the filename when generating a file compare report. (PR #1319)
+
BugFix: Fix report generation process about replacement with HTML
+entity (PR #1344)
BugFix: Fix an issue where WinMerge crashes depending on the
+filename when generating a file compare report. (PR #1319)
Configuration log
@@ -688,8 +880,13 @@
Configuration log
Plugins
-
BugFix: CompareMSExcelFiles Plugins did not compare folders when opening .xlsx files from Plugins-> Edit with Unpacker menu item even though the "Extract workbook data to multiple files" option is enabled in the plugin settings (osdn.net #44522)
-
BugFix: Fix a problem where the "Open files in the same window type after unpacking" checkbox was checked, but the checkbox was not checked the next time the dialog was opened.
+
BugFix: CompareMSExcelFiles Plugins did not compare folders when
+opening .xlsx files from Plugins-> Edit with Unpacker menu item even
+though the "Extract workbook data to multiple files" option is enabled
+in the plugin settings (osdn.net #44522)
+
BugFix: Fix a problem where the "Open files in the same window type
+after unpacking" checkbox was checked, but the checkbox was not checked
+the next time the dialog was opened.
Sugg: Increase the dialogue for Plugins (#1308)
Command line
@@ -698,10 +895,14 @@
Command line
Shell extension
-
BugFix: Fix an issue where the WinMerge menu displayed in the"Show more options" menu of the Windows 11 Explorer context menu is not an advanced menu, even though the advanced menu is enabled.
-
BugFix: Fix the problem that the WinMerge icon is not correctly displayed on the taskbar when WinMerge is started from the Windows 11 context menu.
+
BugFix: Fix an issue where the WinMerge menu displayed in the"Show
+more options" menu of the Windows 11 Explorer context menu is not an
+advanced menu, even though the advanced menu is enabled.
+
BugFix: Fix the problem that the WinMerge icon is not correctly
+displayed on the taskbar when WinMerge is started from the Windows 11
+context menu.
-
Translations
+
Translations
Translation updates:
@@ -719,11 +920,12 @@
Translations
Russian (PR #1310)
-
Internals
+
Internals
Fix typo in BCMenu.cpp (PR #1313)
Fix type: GPL (PR #1342)
-
Use isupper+tolower instead of islower+toupper (diffutils ver2.7) (PR #1351)
+
Use isupper+tolower instead of islower+toupper (diffutils ver2.7)
+(PR #1351)
Initialize variables defined at "diff.h" (PR #1360)
WinMerge 2.16.20 - 2022-04-27
@@ -731,9 +933,11 @@
General
BugFix: New filter (F) display (#1281 a))
-
File compare
+
File compare
-
BugFix: Fixed a problem where the caret would not display in the correct position on lines containing tab characters, depending on the font in use (osdn.net #44417)
+
BugFix: Fixed a problem where the caret would not display in the
+correct position on lines containing tab characters, depending on the
+font in use (osdn.net #44417)
Webpage compare
@@ -741,7 +945,10 @@
Webpage compare
Requires WebView2 Runtime.
Only supported on Windows 10 and above.
-
Currently, it is not possible to directly highlight differences between web pages, but it is possible to display two or three web pages side by side. You can also compare the following content of the displayed web pages
+
Currently, it is not possible to directly highlight differences
+between web pages, but it is possible to display two or three web pages
+side by side. You can also compare the following content of the
+displayed web pages
Screenshots
HTML contents
@@ -750,9 +957,11 @@
Webpage compare
-
Folder compare
+
Folder compare
-
BugFix: Fix an issue where items with different case are not displayed correctly in the folder compare window when comparing three directories. (PR #1299)
+
BugFix: Fix an issue where items with different case are not
+displayed correctly in the folder compare window when comparing three
+directories. (PR #1299)
Options dialog
@@ -760,20 +969,29 @@
Options dialog
Plugins
-
BugFix: CompareMSExcelFiles.sct: Date formats interpreted inconsistently (#279)
+
BugFix: CompareMSExcelFiles.sct: Date formats interpreted
+inconsistently (#279)
Add URL handler plugins (PR #1270)
HTTP/HTTPS scheme handler plugin
-
This plugin retrieves a file with the specified HTTP or HTTPS URL using the curl command.
+
This plugin retrieves a file with the specified HTTP or HTTPS URL
+using the curl command.
Windows Registry scheme(reg:) handler plugin
-
This plugin handles URLs like reg:HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge. After reg:, it considers it a registry key and uses the reg.exe command to retrieve information about that registry key.
+
This plugin handles URLs like
+reg:HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge.
+After reg:, it considers it a registry key and uses the
+reg.exe command to retrieve information about that registry key.
-
Replace plugin: When regular expression substitution is performed with the -e option, \r and \n in the second argument are now treated as control characters CR and LF.
-
PrettifyHTML plugin: Added "--tidy-mark no" to default plugin arguments
+
Replace plugin: When regular expression substitution is performed
+with the -e option, \r and \n in
+the second argument are now treated as control characters CR and
+LF.
+
PrettifyHTML plugin: Added "--tidy-mark no" to default plugin
+arguments
Command line
@@ -783,7 +1001,7 @@
Manual
BugFix: Help file: Small issue for plugins (#1309)
-
Translations
+
Translations
Translation updates:
@@ -801,38 +1019,52 @@
Translations
Turkish (PR #1264)
-
Internals
+
Internals
-
Code refactor with C++17 features replace optimize create smart pointers (PR #1304)
-
Fixed link errors occurring in Windows 10 SDK version 10.0.19041.0 and lower
+
Code refactor with C++17 features replace optimize create smart
+pointers (PR #1304)
+
Fixed link errors occurring in Windows 10 SDK version 10.0.19041.0
+and lower
WinMerge 2.16.19 - 2022-03-20
General
Update Merge.rc (PR #1219,#1227,#1231,#1232)
-
File compare
+
File compare
-
BugFix: Match similar lines breaks with Ignore whitespace change (#1209)
-
BugFix: Copy & Advance skips differences when moved block detection is on (#1235)
-
BugFix: Fix inline difference selection by F4 key not working well in various cases
-
Different exit procedure required for small vs. large files (#1218)
-
Added View → View Top Margins menu item. (A ruler appears in the margin)
+
BugFix: Match similar lines breaks with Ignore whitespace change
+(#1209)
+
BugFix: Copy & Advance skips differences when moved block
+detection is on (#1235)
+
BugFix: Fix inline difference selection by F4 key not working well
+in various cases
+
Different exit procedure required for small vs. large files
+(#1218)
+
Added View → View Top Margins menu item. (A ruler appears in the
+margin)
Table compare
Pinning first row of file (#999)
-
Added Use First Line as Headers menu item to the column header context menu.
+
Added Use First Line as Headers menu item to the column header
+context menu.
-
Folder compare
+
Folder compare
-
BugFix: Fix the problem that the status bar displays "0 items selected" even though multiple items are selected.
-
BugFix: Change the file naming method of the file compare report to avoid duplication of the file compare report file name linked from the folder compare report. (PR #1171)
-
BugFix: Fix an issue where comparison results are not displayed correctly when "Refresh Selected" is performed by selecting an item that has a directory and file with the same name. (PR #1189)
+
BugFix: Fix the problem that the status bar displays "0 items
+selected" even though multiple items are selected.
+
BugFix: Change the file naming method of the file compare report to
+avoid duplication of the file compare report file name linked from the
+folder compare report. (PR #1171)
+
BugFix: Fix an issue where comparison results are not displayed
+correctly when "Refresh Selected" is performed by selecting an item that
+has a directory and file with the same name. (PR #1189)
BugFix: Folder compare with jpg images crashes (#1176)
-
BugFix: Fix renaming process in folder compare window. (PR #1246)
+
BugFix: Fix renaming process in folder compare window. (PR
+#1246)
Filters
@@ -840,12 +1072,16 @@
Filters
File masks
-
Putting ! before file masks will exclude files that match that masks.
-
If you put \ after the file masks, the masks will match folders instead of files.
+
Putting ! before file masks will exclude files that
+match that masks.
+
If you put \ after the file masks, the masks will match
+folders instead of files.
File filters
-
Added f!: and d!: to exclude files or folders that match the pattern specified in f: and d:.
+
Added f!: and d!: to exclude files or
+folders that match the pattern specified in f: and
+d:.
@@ -857,9 +1093,11 @@
Options dialog
Plugins
-
BugFix: Select Plugin Dialog: Fix the problem that the plugin arguments are deleted by clicking the "Add pipe" button after entering them.
+
BugFix: Select Plugin Dialog: Fix the problem that the plugin
+arguments are deleted by clicking the "Add pipe" button after entering
+them.
-
Translations
+
Translations
Translation updates:
@@ -882,10 +1120,11 @@
Translations
Ukrainian (PR #1172)
-
Internals
+
Internals
Fix typo in ShellFileOperations.cpp (PR #1256)
-
[Big PR - big changes] A lot of refactor and optimization commits (PR #1258)
+
[Big PR - big changes] A lot of refactor and optimization commits
+(PR #1258)
Wrong links for ShellExtension on Translations page (#1185)
Tweak translations status (PR #1201)
@@ -893,17 +1132,24 @@
WinMerge 2.16.18 - 2022-01-27
General
BugFix: Crash when comparing files in Google Drive
-
[Feature Request] Lengthen title of File Compare window or add tip (#960)
+
[Feature Request] Lengthen title of File Compare window or add tip
+(#960)
added me to contributor list (PR #1094)
-
Made it so that the parent window cannot be operated while the font selection dialog displayed from View→Select Font menu item is displayed.
+
Made it so that the parent window cannot be operated while the font
+selection dialog displayed from View→Select Font menu item is
+displayed.
-
File compare
+
File compare
BugFix: wm 2.16.16.0 crashes with file attached (#1101)
-
BugFix: Fix a problem that 'Encountered an improper argument' error occurs when a pane split by Window→Split menu item is unsplit by drag operation.
-
BugFix: Colors -> Differences -> Word Difference : Text color ignored (#1116)
+
BugFix: Fix a problem that 'Encountered an improper argument' error
+occurs when a pane split by Window→Split menu item is unsplit by drag
+operation.
+
BugFix: Colors -> Differences -> Word Difference : Text color
+ignored (#1116)
BugFix: WinMerge crashes with specific regex search (#1160)
-
3-Way File Merge: No Keyboard / hot keys available for Merging from Left Pane to right pane and vice versa (#957)
+
3-Way File Merge: No Keyboard / hot keys available for Merging from
+Left Pane to right pane and vice versa (#957)
Winmerge hangs when i try to compare files. (#1111)
Fast encoding switching. (#793)
@@ -911,21 +1157,29 @@
Clipboard Compare
New Feature: Clipboard Compare (PR #1147)
-
Click File → Open Clipboard menu item to compare the two most recent contents of the clipboard history.
-
You can also compare by pressing Ctrl+V when the child MDI window is not visible.
-
This feature is available on Windows 10 version 1809 or higher and WinMerge 64-bit version.
+
Click File → Open Clipboard menu item to compare the two most recent
+contents of the clipboard history.
+
You can also compare by pressing Ctrl+V when the child MDI window is
+not visible.
+
This feature is available on Windows 10 version 1809 or higher and
+WinMerge 64-bit version.
-
Folder compare
+
Folder compare
-
BugFix: Sorting on Comparison Result being done incorectly (#483)
-
BugFix: Fix an issue where WinMerge sometimes crashes when executing "Refresh Selected" in the folder compare window. (PR #1120)
-
BugFix: Fixed a bug that the parent folder icon was not displayed in non-recursive mode.
-
BugFix: Fixed the problem that the sort order is different from version 2.16.16 or earlier
+
BugFix: Sorting on Comparison Result being done incorectly
+(#483)
+
BugFix: Fix an issue where WinMerge sometimes crashes when executing
+"Refresh Selected" in the folder compare window. (PR #1120)
+
BugFix: Fixed a bug that the parent folder icon was not displayed in
+non-recursive mode.
+
BugFix: Fixed the problem that the sort order is different from
+version 2.16.16 or earlier
BugFix: Fix the problem that the "Register Shell Extension for Windows 11 or later" button is not enabled when another user has registered ShellExtension for Windows 11.
+
BugFix: Fix the problem that the "Register Shell Extension for
+Windows 11 or later" button is not enabled when another user has
+registered ShellExtension for Windows 11.
Plugins
-
BugFix: Plugin unpacked file extension problem (get_PluginUnpackedFileExtension) (#983)
Apache Tika plugin: Update Apache tika to 2.1.0 and change the
+download URL
+
CompareMSExcelFiles.sct: Make the number before the sheet name
+zero-padded
Shell extension
-
BugFix: ShellExtension for Windows 11 did not work on machines that did not have MSVCP140.dll VCRUNTIME140*.dll installed.
-
BugFix: Loop counter should be the same type as the count type. (PR #987)
-
ShellExtension for Windows11: Disable Registry Write Virtualization
+
BugFix: ShellExtension for Windows 11 did not work on machines that
+did not have MSVCP140.dll VCRUNTIME140*.dll installed.
+
BugFix: Loop counter should be the same type as the count type. (PR
+#987)
+
ShellExtension for Windows11: Disable Registry Write
+Virtualization
Manual
Where to report documentation/help errors? (#1004)
-
Translations
+
Translations
Translation updates:
@@ -1105,45 +1390,61 @@
Translations
Turkish (PR #980)
-
Internals
+
Internals
-
BugFix: Missing packages.config (also outdated) and wrong NuGet packages path in the WinMergeContextMenu.vcxproj and .filters file (#985)
+
BugFix: Missing packages.config (also outdated) and wrong NuGet
+packages path in the WinMergeContextMenu.vcxproj and .filters file
+(#985)
Fix typo in OpenView.cpp (PR #1000)
WinMerge 2.16.15 - 2021-09-20
General
-
BugFix: WinMerge would crash when launched if the registry or INI file contained invalid values.
-
BugFix: Winmerge Crash when comparing 2 files from Windows Explorer context menu (#808, #908, #913)
-
BugFix: Incorrect text color for selected menu item on Windows 11
-
BugFix: 50% cpu use by winmergeu.exe after program closed (#903)
+
BugFix: WinMerge would crash when launched if the registry or INI
+file contained invalid values.
+
BugFix: Winmerge Crash when comparing 2 files from Windows Explorer
+context menu (#808, #908, #913)
+
BugFix: Incorrect text color for selected menu item on Windows
+11
+
BugFix: 50% cpu use by winmergeu.exe after program closed
+(#903)
Digitally sign packages (#152)
-
File compare
+
File compare
-
BugFix: The mouse cursor did not change to an hourglass when the files or plugins were taking a long time to load.
-
BugFix: Save Middle and Save Middle As menu items were not enabled when comparing three files.
-
BugFix: A two-pane window was displayed even though New (3panes) → Table menu item was selected.
-
BugFix: The height of each pane in the Diff pane was calculated incorrectly when comparing three files.
-
BugFix: Unicode SMP chars misrendered after performing a find (#914)
+
BugFix: The mouse cursor did not change to an hourglass when the
+files or plugins were taking a long time to load.
+
BugFix: Save Middle and Save Middle As menu items were not enabled
+when comparing three files.
+
BugFix: A two-pane window was displayed even though New (3panes) →
+Table menu item was selected.
+
BugFix: The height of each pane in the Diff pane was calculated
+incorrectly when comparing three files.
+
BugFix: Unicode SMP chars misrendered after performing a find
+(#914)
BugFix: Crash when pressing Shift+F4 key
BugFix: Replace slow (#940)
-
BugFix: When moving in the scroll pane, the selected position is incorrect (#970)
-
BugFix: When the Diff pane was redisplayed, the scroll position of the Diff pane was not appropriate. (osdn.net #42862)
-
Make "Do not close this box" checkbox in search window On by default (#941)
+
BugFix: When moving in the scroll pane, the selected position is
+incorrect (#970)
+
BugFix: When the Diff pane was redisplayed, the scroll position of
+the Diff pane was not appropriate. (osdn.net #42862)
+
Make "Do not close this box" checkbox in search window On by default
+(#941)
-
Image compare
+
Image compare
BugFix: Duplicate menu shortcut in translations (#905)
BugFix: Image comparison (winimerge #24)
Project file
-
Add a feature to save/restore compare options to/from a project file.(#498) (PR #915)
+
Add a feature to save/restore compare options to/from a project
+file.(#498) (PR #915)
Options dialog
-
Add a feature to set items saved to or restored from the project file. (PR #953)
+
Add a feature to set items saved to or restored from the project
+file. (PR #953)
Plugins
@@ -1161,11 +1462,14 @@
Command line
Shell extension
-
BugFix: WinMerge's extended menu items were doubly inserted into the context menu of Explorer's navigation pane. (osdn.net #42702)
+
BugFix: WinMerge's extended menu items were doubly inserted into the
+context menu of Explorer's navigation pane. (osdn.net #42702)
BugFix: Right click - compare - is unclear (#249)
-
Added a new DLL (WinMergeContextMenu.dll) for the Windows 11 Explorer context menu (currently unstable and not registered by default) (PR #954)
+
Added a new DLL (WinMergeContextMenu.dll) for the Windows 11
+Explorer context menu (currently unstable and not registered by default)
+(PR #954)
-
Translations
+
Translations
Translation updates:
@@ -1183,32 +1487,40 @@
Translations
Turkish (PR #899)
-
Internals
+
Internals
-
README.md: Make it clear that requirements are to build, not use the application (PR #942)
-
compiler-calculated maximum value for m_SourceDefs (PR #966)
+
README.md: Make it clear that requirements are to build, not use the
+application (PR #942)
+
compiler-calculated maximum value for m_SourceDefs (PR
+#966)
WinMerge 2.16.14 - 2021-07-25
General
-
Fixed an issue where the WinMerge process might not terminate even though the WinMerge window was closed.
+
Fixed an issue where the WinMerge process might not terminate even
+though the WinMerge window was closed.
-
File compare
+
File compare
-
BugFix: Fixed an infinite loop when "find what" in the substitution filters is empty.
+
BugFix: Fixed an infinite loop when "find what" in the substitution
+filters is empty.
-
Folder compare
+
Folder compare
-
BugFix: Fix an issue where a file is deselected when returning to the folder compare window after opening the file compare window by double-clicking the file in the folder compare window. (PR #857)
-
Right click context menu - Compare files or folders in a new tab (#232,#277)
+
BugFix: Fix an issue where a file is deselected when returning to
+the folder compare window after opening the file compare window by
+double-clicking the file in the folder compare window. (PR #857)
+
Right click context menu - Compare files or folders in a new tab
+(#232,#277)
Binary compare
BugFix: Fixed an issue where window titles may not be updated
BugFix: BS key did not work at the beginning of the line after splitting the pane or clicking the OK button in the Options dialog.
-
BugFix: The edited contents were discarded when the "Recompare As" menu item was selected after editing the file
-
BugFix: Incorrect comparison (#834) (This bug occured when enabling both the 'Ignore blank lines' option and the 'Completely unhighlight the ignored differences' option.)
+
BugFix: BS key did not work at the beginning of the line after
+splitting the pane or clicking the OK button in the Options dialog.
+
BugFix: The edited contents were discarded when the "Recompare As"
+menu item was selected after editing the file
+
BugFix: Incorrect comparison (#834) (This bug occured when enabling
+both the 'Ignore blank lines' option and the 'Completely unhighlight the
+ignored differences' option.)
Add Smarty syntax highlighting. (PR #821)
Thicken the caret in overwrite mode (osdn.net #42179)
-
Folder compare
+
Folder compare
-
BugFix: Different Files are Identical? (#768) (When comparing files with only BOM and no contents, the comparison result became unstable because it referred to the uninitialized memory.)
+
BugFix: Different Files are Identical? (#768) (When comparing files
+with only BOM and no contents, the comparison result became unstable
+because it referred to the uninitialized memory.)
BugFix: Fix a crash when re-comparing folders (osdn.net #42219)
Binary compare
BugFix: The file could not be saved after creating a new one
-
Made Unpacker plugins available for image compare and binary compare
+
Made Unpacker plugins available for image compare and binary
+compare
-
Image compare
+
Image compare
-
BugFix: Error on try to show differences between two different gif (#784)
-
Made Unpacker plugins available for image compare and binary compare
+
BugFix: Error on try to show differences between two different gif
+(#784)
+
Made Unpacker plugins available for image compare and binary
+compare
Plugins
Improve plugin system (PR #797)
Added categorized Unpacker plugin menu items to various menus
-
Made it possible to specify multiple Unpacker/Prediffer plugins by concatenating them with | and to specify arguments.
-
Allowed Unpacker/Prediffer plugins to be specified for multiple files at once in Folder Compare window. The specified plugin will be visible in the Unpacker and Prediffer columns
-
Add "(U)" or "(P)" to the tab title of the window opened by the Unpacker/Prediffer plugin.
-
Allowed the plugin settings dialog to specify default arguments that will be used when no plugin arguments are specified
-
Allowed plugins used by Automatic Unpacking/Prediffing to be excluded in the plugin settings dialog
+
Made it possible to specify multiple Unpacker/Prediffer plugins by
+concatenating them with | and to specify arguments.
+
Allowed Unpacker/Prediffer plugins to be specified for multiple
+files at once in Folder Compare window. The specified plugin will be
+visible in the Unpacker and Prediffer columns
+
Add "(U)" or "(P)" to the tab title of the window opened by the
+Unpacker/Prediffer plugin.
+
Allowed the plugin settings dialog to specify default arguments that
+will be used when no plugin arguments are specified
+
Allowed plugins used by Automatic Unpacking/Prediffing to be
+excluded in the plugin settings dialog
New unpacker plugins:
ApacheTika
@@ -1362,9 +1704,10 @@
Plugins
-
Translations
+
Translations
-
BugFix: Fix an issue where a message is not translated.(PR #763)
+
BugFix: Fix an issue where a message is not translated.(PR
+#763)
Translation updates:
French (PR #762)
@@ -1374,10 +1717,11 @@
Translations
Russian (PR #761)
-
Internals
+
Internals
Update CWindowsManagerDialog (PR #811)
-
Update CWindowsManagerDialog - check some pointers for null and made safe casts (PR #824)
+
Update CWindowsManagerDialog - check some pointers for null and made
+safe casts (PR #824)
BugFix: Plugins project DisplayXMLFiles.vcxproj contains "Unicode
+Release MinSize" configuration but was removed (#611)
Expression is always true (#612,PR #613)
-
Plugins.cpp function SearchScriptForMethodName can be improved (#690)
+
Plugins.cpp function SearchScriptForMethodName can be improved
+(#690)
WinMerge 2.16.10 - 2021-01-30
General
-
BugFix: Fixed processing that uses GetAsyncKeyState(). (GitHub PR #505)
-
BugFix: Fixed the problem that the language setting is not applied to the context menu of the MDI tab when the language setting is changed. (GitHub PR #523)
-
BugFix: command-line option /x did not work for binary and image comparison
+
BugFix: Fixed processing that uses GetAsyncKeyState(). (GitHub PR
+#505)
+
BugFix: Fixed the problem that the language setting is not applied
+to the context menu of the MDI tab when the language setting is changed.
+(GitHub PR #523)
+
BugFix: command-line option /x did not work for binary and image
+comparison
BugFix: Substiturions vs. Substitutions (GitHub #551)
-
Swap Panes functionality for 3 way compares (Issue #507) (GitHub PR #533)
-
[feature request] Add options to command line to change "compare methods"
+
Swap Panes functionality for 3 way compares (Issue #507) (GitHub PR
+#533)
+
[feature request] Add options to command line to change "compare
+methods"
(GitHub #530)
-
Added the command line option "/s-" to ensure that another instance is always executed, ignoring the value of the 'Allow only one instance to run' option.
+
Added the command line option "/s-" to ensure that another instance
+is always executed, ignoring the value of the 'Allow only one instance
+to run' option.
-
File compare
+
File compare
BugFix: WinMerge crashes with mouse double click (GitHub #531)
-
BugFix: Fixed an issue where the message box "The report has been created successfully." was displayed even if the report creation failed.
-
BugFix: BUG: Doesn't respect "Don't ask this question again" checkbox when comparing large files (GitHub #574)
-
The Location pane doesn't draw a line connecting moved differences by default (GitHub #498)
-
Update crystallineparser.cpp - AutoIt (*.au3) support as a "Basic" (GitHub PR #543)
-
s_apszAutoItKeywordList[] - actualization for AutoIt (GitHub PR #584)
+
BugFix: Fixed an issue where the message box "The report has been
+created successfully." was displayed even if the report creation
+failed.
+
BugFix: BUG: Doesn't respect "Don't ask this question again"
+checkbox when comparing large files (GitHub #574)
+
The Location pane doesn't draw a line connecting moved differences
+by default (GitHub #498)
+
Update crystallineparser.cpp - AutoIt (*.au3) support as a "Basic"
+(GitHub PR #543)
+
s_apszAutoItKeywordList[] - actualization for AutoIt (GitHub PR
+#584)
Added JavaScript and JSON syntax highligher (osdn.net #41083)
Added View -> Diff Context -> Invert menu item
-
Feature Request: Move To Next File option while comparing files #475 (GitHub PR #561)
-
A new feature "Ignored Substutions" (GitHub PR #544,#549,#560) ("Ignored Substitutions" was renamed to "Substitution Filters")
+
Feature Request: Move To Next File option while comparing files #475
+(GitHub PR #561)
+
A new feature "Ignored Substutions" (GitHub PR #544,#549,#560)
+("Ignored Substitutions" was renamed to "Substitution Filters")
-
Folder compare
+
Folder compare
-
BugFix: Winmerge crashes consistently when deleting files (GitHub #491)
-
BugFix: Copy Folder does not copy subfolders and I don't see any option for it (GitHub #537)
+
BugFix: Winmerge crashes consistently when deleting files (GitHub
+#491)
+
BugFix: Copy Folder does not copy subfolders and I don't see any
+option for it (GitHub #537)
Table compare
@@ -1568,7 +1971,7 @@
Binary compare
Added File -> New -> Binary menu item
-
Image compare
+
Image compare
Implement copy and paste images (GitHub PR #524)
Added File -> New -> Image menu item
@@ -1576,17 +1979,19 @@
Image compare
Options dialog
-
Fix an issue where custom colors are not saved. (GitHub PR #648)
+
Fix an issue where custom colors are not saved. (GitHub PR
+#648)
Filter dialog
-
Making CPropertySheet resizable needs some re-work. (Issue #509) (GitHub PR #535)
+
Making CPropertySheet resizable needs some re-work. (Issue #509)
+(GitHub PR #535)
Patch Generator dialog
BugFix: Crash when generating patch (GitHub #521)
-
Translations
+
Translations
Translation updates:
@@ -1606,46 +2011,73 @@
Manual
Small tweaks for the Manual (GitHub PR #508)
Windows XP Pro SP0 vs Requirements (GitHub #515)
-
Internals
+
Internals
Fix Various Warnings (GitHub PR #539)
Various fixes to testing (GitHub PR #545)
Some tweaks for translations status (GitHub PR #556)
-
Link error when building Plugins\src_VCPP\DisplayXMLFiles with Visual Studio 2019 16.7.7 (GitHub #554)
-
Link error when building VCPP plugin DisplayXMLFiles with Visual Studio 2019 16.7.7 (GitHub #555)
-
Link warnings when building VCPP plugin DisplayXMLFiles with Visual Studio 2019 16.7.7 (GitHub #558)
-
Some more files should be added to the .gitignore file (GitHub #559)
+
Link error when
+building Plugins\src_VCPP\DisplayXMLFiles with Visual
+Studio 2019 16.7.7 (GitHub #554)
+
Link error when building VCPP plugin DisplayXMLFiles with Visual
+Studio 2019 16.7.7 (GitHub #555)
+
Link warnings when building VCPP plugin DisplayXMLFiles with Visual
+Studio 2019 16.7.7 (GitHub #558)
+
Some more files should be added to the .gitignore file (GitHub
+#559)
WinMerge 2.16.9 - 2020-11-29
General
-
BugFix: MainFrm.cpp: Toolbar was leaking image lists (GitHub PR #432)
-
BugFix: The icons on a 43" 4K screen are too small (GitHub #276)
+
BugFix: MainFrm.cpp: Toolbar was leaking image lists (GitHub PR
+#432)
+
BugFix: The icons on a 43" 4K screen are too small (GitHub
+#276)
Update English.pot (GitHub #440)
Update Merge.rc (GitHub #487)
Improved startup time
-
File compare
+
File compare
-
BugFix: [UI] Pane enlargement was reset after changing tab (GitHub #403)
-
BugFix: Non-comment differences were sometimes ignored when the comment filter was enabled, (osdn.net #40488)
-
BugFix: Line Filters aren't applied when using a 3rd file (GitHub #395)
-
BugFix: "Ignore blank lines" does not work in 3-way compare (GitHub #450)
-
BugFix: Fix the problem that the comparison result is displayed one line off in the file compare window if a sync point is added with the first line selected. (GitHub PR #435)
-
BugFix: Fix the problem accessing the text buffer out of range if a sync point is added by selecting a ghost line that is after the last block. (GitHub PR #457)
-
BugFix: Fix the problem that "Goto...", "Goto Line <line>" and moving by left click on the location pane do not work appropriately when the Diff pane is active in the file compare window. (GitHub PR #476)
-
BugFix: Reloading file does not refresh its encoding (GitHub #466)
-
BugFix: Editor text display is abnormal - character spacing problem (GitHub #468)
-
always copy "full line" instead of "selected text only" - option CopyFullLine (GitHub PR #459)
-
Add the feature "Go to Moved Line" requested by #278 (GitHub PR #484)
-
how to show white space with linebreak hidden? (GitHub #265) (Added View->View EOL menu item)
+
BugFix: [UI] Pane enlargement was reset after changing tab (GitHub
+#403)
+
BugFix: Non-comment differences were sometimes ignored when the
+comment filter was enabled, (osdn.net #40488)
+
BugFix: Line Filters aren't applied when using a 3rd file (GitHub
+#395)
+
BugFix: "Ignore blank lines" does not work in 3-way compare (GitHub
+#450)
+
BugFix: Fix the problem that the comparison result is displayed one
+line off in the file compare window if a sync point is added with the
+first line selected. (GitHub PR #435)
+
BugFix: Fix the problem accessing the text buffer out of range if a
+sync point is added by selecting a ghost line that is after the last
+block. (GitHub PR #457)
+
BugFix: Fix the problem that "Goto...", "Goto Line <line>" and
+moving by left click on the location pane do not work appropriately when
+the Diff pane is active in the file compare window. (GitHub PR
+#476)
+
BugFix: Reloading file does not refresh its encoding (GitHub
+#466)
+
BugFix: Editor text display is abnormal - character spacing problem
+(GitHub #468)
+
always copy "full line" instead of "selected text only" - option
+CopyFullLine (GitHub PR #459)
+
Add the feature "Go to Moved Line" requested by #278 (GitHub PR
+#484)
+
how to show white space with linebreak hidden? (GitHub #265) (Added
+View->View EOL menu item)
BugFix: Sorting on Comparison Result being done incorectly (GitHub
+#483)
+
Commandline to display versions in the output report (GitHub
+#418)
+
"Don't ask again" checkbox for the Confirm Copy dialog (GitHub PR
+#445)
Binary compare
@@ -1653,13 +2085,17 @@
Binary compare
Options dialog
-
Added "Automatically scroll to first inline difference" option to Options dialog
+
Added "Automatically scroll to first inline difference" option to
+Options dialog
Patch Generator dialog
-
BugFix: Fixed the problem that the input to File1 or File2 comboboxes of the Patch Generator dialog is not applied when the Patch Generator dialog is opened by selecting multiple files. (GitHub PR #421)
+
BugFix: Fixed the problem that the input to File1 or File2
+comboboxes of the Patch Generator dialog is not applied when the Patch
+Generator dialog is opened by selecting multiple files. (GitHub PR
+#421)
-
Translations
+
Translations
Translation updates:
@@ -1681,43 +2117,57 @@
Manual
Update Shortcut_keys.xml (GitHub PR #430)
Update manual (GitHub PR #485,#492)
-
Internals
+
Internals
-
Tweak output from BuildInstaller.cmd and BuildArc.cmd (GitHub PR #424)
+
Tweak output from BuildInstaller.cmd and BuildArc.cmd (GitHub PR
+#424)
Fix typo in GhostTextBuffer.cpp (GitHub PR #472)
Fix typo in memdc.h (GitHub PR #474)
WinMerge 2.16.8 - 2020-08-28
General
-
BugFix: More space for some internationalized strings (GitHub #402)
+
BugFix: More space for some internationalized strings (GitHub
+#402)
BugFix: Some improvements (GitHub #405,#411)
-
File compare
+
File compare
-
BugFix: Ignore case option did not work when Diff algorithm was other than default
-
BugFix: A white vertical rectangle was sometimes drawn in the selected area
-
BugFix: The title of the file comparison window after changing the language was accidentally changed to "Untitled left/right"
-
BugFix: Wrong merging (GitHub #420) (minimal/patience/histogram diff algorithm did not work on Windows XP)
+
BugFix: Ignore case option did not work when Diff algorithm was
+other than default
+
BugFix: A white vertical rectangle was sometimes drawn in the
+selected area
+
BugFix: The title of the file comparison window after changing the
+language was accidentally changed to "Untitled left/right"
+
BugFix: Wrong merging (GitHub #420) (minimal/patience/histogram diff
+algorithm did not work on Windows XP)
Extended F4 key movement range to the whole file
-
Don't treat UTF-8 and UTF-8 with BOM the same when the "Ignore codepage differences" option is disabled
+
Don't treat UTF-8 and UTF-8 with BOM the same when the "Ignore
+codepage differences" option is disabled
-
Folder compare
+
Folder compare
-
BugFix: Appropriate error messages were not displayed when the file to be deleted no longer existed
-
BugFix: 'Show Middle/Right Unique items' menu item does not work properly in 3-way folder compare (osdn.net #40672)
-
CTRL+Drag folders now has the opposite behavior of the current Include Subfolders option
+
BugFix: Appropriate error messages were not displayed when the file
+to be deleted no longer existed
+
BugFix: 'Show Middle/Right Unique items' menu item does not work
+properly in 3-way folder compare (osdn.net #40672)
+
CTRL+Drag folders now has the opposite behavior of the current
+Include Subfolders option
BugFix: The icons on a 43" 4K screen are too small (GitHub #276)
+
BugFix: The icons on a 43" 4K screen are too small (GitHub
+#276)
BugFix: GUI glitches/bugs (GitHub #316)
BugFix: Several issues regarding i18n (GitHub #314)
Add Solarized Dark/Light color scheme (GitHub #287)
Compile WinMerge with ASLR and CFG enabled (GitHub #315)
-
File compare
+
File compare
BugFix: Diff Pane issues (GitHub #307)
BugFix: Codepage not updated on refresh (GitHub #320)
BugFix: Crashes when comparing large files (GitHub #325)
-
BugFix: WinMerge does not recognize the same files (GitHub #332)
-
BugFix: Moved ghost lines are shown in the wrong color (GitHub #358)
+
BugFix: WinMerge does not recognize the same files (GitHub
+#332)
+
BugFix: Moved ghost lines are shown in the wrong color (GitHub
+#358)
BugFix: opening same file (GitHub #362)
-
BugFix: Find dialog sometimes remembers old text to start a new find instead of the new text. (GitHub #368)
-
BugFix: Fix a problem where markers that are out of the range of the current difference appear in the difference pane. (osdn.net 40407)
-
BugFix: HTML5 encoding (<meta charset="..." >) is ignored. (osdn.net #40476)
+
BugFix: Find dialog sometimes remembers old text to start a new find
+instead of the new text. (GitHub #368)
+
BugFix: Fix a problem where markers that are out of the range of the
+current difference appear in the difference pane. (osdn.net 40407)
+
BugFix: HTML5 encoding (<meta charset="..." >) is ignored.
+(osdn.net #40476)
'=' should be included in word separator (osdn.net #40224)
Allow specifying default for EOL warning checkbox (GitHub #297)
Only indent existing lines (GitHub #356)
Table compare
-
Made it possible to display the contents of CSV and TSV files like spreadsheet software.
+
Made it possible to display the contents of CSV and TSV files like
+spreadsheet software.
-
Folder compare
+
Folder compare
-
BugFix: DST causes incorrect dates shown in Date column (GitHub #299)
+
BugFix: DST causes incorrect dates shown in Date column (GitHub
+#299)
BugFix: Long filename issue (GitHub #339)
-
BugFix: Winmerge Freeze if large number of files are listed in Window View (GitHub #348)
-
BugFix: Change to disable some menu items that should not be executed for directories, when directories are selected in the folder compare window. (GitHub PR #366)
+
BugFix: Winmerge Freeze if large number of files are listed in
+Window View (GitHub #348)
+
BugFix: Change to disable some menu items that should not be
+executed for directories, when directories are selected in the folder
+compare window. (GitHub PR #366)
BugFix: Update DirViewColItems.cpp (GitHub #376)
-
BugFix: Fix the problem that not 3 panes but 2 panes file compare window displays when executing "Compare As" > "Binary" or "Compare As" > "Image" in the context menu in the folder compare window with selecting 3 items. (GitHub PR #381)
-
BugFix: Fix a problem where a text file could be considered a binary file. (osdn.net #40296)
-
BugFix: crash when clicking [Merge]-> [Delete] menu item while renaming a file
-
Add a feature generating a patch from directories (#283) (GitHub PR #331)
+
BugFix: Fix the problem that not 3 panes but 2 panes file compare
+window displays when executing "Compare As" > "Binary" or "Compare
+As" > "Image" in the context menu in the folder compare window with
+selecting 3 items. (GitHub PR #381)
+
BugFix: Fix a problem where a text file could be considered a binary
+file. (osdn.net #40296)
+
BugFix: crash when clicking [Merge]-> [Delete] menu item while
+renaming a file
+
Add a feature generating a patch from directories (#283) (GitHub PR
+#331)
added bin and obj directories to C# filter (GitHub PR #365)
-
Image compare
+
Image compare
-
BugFix: Scrolling behavior when dragging images is wrong (osdn.net #40205)
+
BugFix: Scrolling behavior when dragging images is wrong (osdn.net
+#40205)
Open dialog
-
BugFix: Open dialogs are sometimes left as garbage (osdn.net #40487)
-
Browse button in the file/dir selection show wrong path (GitHub #346)
+
BugFix: Open dialogs are sometimes left as garbage (osdn.net
+#40487)
+
Browse button in the file/dir selection show wrong path (GitHub
+#346)
Options dialog
-
BugFix: Pressing the [Compare/Binary] category button in the Options dialog twice will cause a crash. (osdn.net #40308)
+
BugFix: Pressing the [Compare/Binary] category button in the Options
+dialog twice will cause a crash. (osdn.net #40308)
Plugins
-
BugFix: Fix handling of line breaks in SortAscending, SortDescending (osdn.net PR #40266)
-
BugFix: Error when comparing images in the CompareMSExcelFiles.sct plugin (osdn.net #40472)
-
CompareMSExcelFiles.sct: Include Excel Addin files (*.xlam) (GitHub PR #269)
+
BugFix: Fix handling of line breaks in SortAscending, SortDescending
+(osdn.net PR #40266)
+
BugFix: Error when comparing images in the CompareMSExcelFiles.sct
+plugin (osdn.net #40472)
+
CompareMSExcelFiles.sct: Include Excel Addin files (*.xlam) (GitHub
+PR #269)
Add support for C# and TypeScript (GitHub PR #382)
Add a plugin for Visio (osdn.net PR #40473)
-
Plugin fixes for the new Table Compare (CompareMSExcelFiles.sct, IgnoreFieldsComma.dll, IgnoreFieldsTab.dll)
+
Plugin fixes for the new Table Compare (CompareMSExcelFiles.sct,
+IgnoreFieldsComma.dll, IgnoreFieldsTab.dll)
Archive support
@@ -1822,9 +2302,11 @@
Archive support
Installer
-
Create the installer with Inno Setup 5.x since installers created with Inno Setup 6.0.x are identified as malware by multiple virus scanning engines
+
Create the installer with Inno Setup 5.x since installers created
+with Inno Setup 6.0.x are identified as malware by multiple virus
+scanning engines
-
Translations
+
Translations
Translation updates:
@@ -1845,9 +2327,10 @@
Translations
Manual
Minor changes to translations README.md file (GitHub #289)
-
Update winmerge.org URL to HTTPS, many small improvements (GitHub PR #306)
+
Update winmerge.org URL to HTTPS, many small improvements (GitHub PR
+#306)
-
Internals
+
Internals
BugFix: Src\Common\MyCom.h unused? (GitHub #284)
BugFix: Error on git repository cloning (GitHub #288)
@@ -1855,38 +2338,50 @@
Internals
WinMerge 2.16.6 - 2020-02-23
General
-
Added CWindowsManagerDialog class for handling open tabs with Ctrl+Tab, now the application is behave just like professional editors (Visual Studio, Notepad++, etc.) to switch and activate the open tabs. (GitHub #247)
+
Added CWindowsManagerDialog class for handling open tabs with
+Ctrl+Tab, now the application is behave just like professional editors
+(Visual Studio, Notepad++, etc.) to switch and activate the open tabs.
+(GitHub #247)
-
File compare
+
File compare
-
BugFix: GhostTextBuffer: Don't unexpectedly bring back empty lines user wants to delete (GitHub #244)
-
BugFix: Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes (GitHub #257)
-
BugFix: WinMerge 2.16.4.0 crashes after de-selecting Split Vertically (GitHub #259)
+
BugFix: GhostTextBuffer: Don't unexpectedly bring back empty lines
+user wants to delete (GitHub #244)
+
BugFix: Prevent silent abort with File Comparison of files whose
+size is an exact multiple of 2^32 bytes (GitHub #257)
+
BugFix: WinMerge 2.16.4.0 crashes after de-selecting Split
+Vertically (GitHub #259)
BugFix: "Replace All" may not replace all text
-
BugFix: An error message is shown when pressing Enter key in Diff pane (osdn.net #39924)
-
BugFix: Non-moved lines are treated as moved lines (osdn.net #39851)
+
BugFix: An error message is shown when pressing Enter key in Diff
+pane (osdn.net #39924)
+
BugFix: Non-moved lines are treated as moved lines (osdn.net
+#39851)
Add support for touchpad horizontal scroll (GitHub #254)
-
Image compare
+
Image compare
-
BugFix: Support 16-bit images (GitHub WinMerge/winimerge issue #6)
-
Add support for SVG, PDF, WMF and EMF file types (Only available in WinMerge 64bit version on Windows 10)
+
BugFix: Support 16-bit images (GitHub WinMerge/winimerge issue
+#6)
BugFix: Third tgz doesn't get fully extracted (first two do) (GitHub #263)
+
BugFix: Third tgz doesn't get fully extracted (first two do) (GitHub
+#263)
Patch generator dialog
-
BugFix: Crash when generating patch for multiple files and a file only on one side (GitHub #252)
+
BugFix: Crash when generating patch for multiple files and a file
+only on one side (GitHub #252)
Installer
BugFix: Fix spelling of Git (GitHub #246)
-
Translations
+
Translations
New translation: Arabic (sf.net #3038)
Translation updates:
@@ -1904,48 +2399,64 @@
Manual
BugFix: Fix spelling of Git (GitHub #246)
Update Configuration.xml (GitHub #262)
-
Internals
+
Internals
Consolidate FolderCmp (GitHub #240, #242)
-
Avoid some back and forth file path transcoding between UTF16 and UTF8 (GitHub #243)
+
Avoid some back and forth file path transcoding between UTF16 and
+UTF8 (GitHub #243)
WinMerge 2.16.5 - 2019-12-09
-
File compare
+
File compare
-
BugFix: Suspicious lack of Release() calls in lwdisp.c (GitHub #171)
+
BugFix: Suspicious lack of Release() calls in lwdisp.c (GitHub
+#171)
BugFix: Performance using Unpacker (GitHub #180)
-
BugFix: WinMerge toolbar appears too small on UHD and should default to the conforming Windows 10 scaling/DPI accessibility setting (GitHub #182)
-
BugFix: "Recompare as" menu option doesn't follow current choice (GitHub #191)
-
BugFix: Switching between "Find Next" and "Find Prev" need to click twice (GitHub #202)
+
BugFix: WinMerge toolbar appears too small on UHD and should default
+to the conforming Windows 10 scaling/DPI accessibility setting (GitHub
+#182)
+
BugFix: "Recompare as" menu option doesn't follow current choice
+(GitHub #191)
+
BugFix: Switching between "Find Next" and "Find Prev" need to click
+twice (GitHub #202)
BugFix: Program is crashed! (GitHub #229)
Switch "Find" buttons in Find dialog (GitHub #201)
-
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update
-
Add support for color emoji (Only available in 64bit version) (To enable color emoji support, select DirectWrite* in Rendering mode combobox on Editor page in the Options dialog)
+
Improve UNICODE character support using icu.dll usable from Windows
+10 Creators Update
+
Add support for color emoji (Only available in 64bit version) (To
+enable color emoji support, select DirectWrite* in Rendering mode
+combobox on Editor page in the Options dialog)
Demo: https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4
-
Folder compare
+
Folder compare
-
BugFix: Crash when clicking Next Difference button after unchecking Show Different Items menu item
-
Changed symbols in Newer/Older column for better visual clarity (GitHub #169)
-
Add "Ignore codepage differences" to quick options (GitHub #197)
+
BugFix: Crash when clicking Next Difference button after unchecking
+Show Different Items menu item
+
Changed symbols in Newer/Older column for better visual clarity
+(GitHub #169)
+
Add "Ignore codepage differences" to quick options (GitHub
+#197)
Limit the window flashing count. (GitHub #206)
-
Image compare
+
Image compare
-
BugFix: Image compare breaks when zoomed too much with large pictures (GitHub #188)
-
BugFix: [Image compare] Zoom-in focuses on top-left corner instead of cursor position (GitHub #211)
+
BugFix: Image compare breaks when zoomed too much with large
+pictures (GitHub #188)
+
BugFix: [Image compare] Zoom-in focuses on top-left corner instead
+of cursor position (GitHub #211)
Shell extension
-
BugFix: "Run as Administrator" incompatible with "Shell integration" (ver 2.16.4) (sf.net #2234)
+
BugFix: "Run as Administrator" incompatible with "Shell integration"
+(ver 2.16.4) (sf.net #2234)
Installer
BugFix: Installer russian translation (#168)
BugFix: Windows 10 shell integration not working (GitHub #176)
-
Installer - Proposal - Separate Inno Setup strings from WinMerge installer strings (GitHub #167)
+
Installer - Proposal - Separate Inno Setup strings from WinMerge
+installer strings (GitHub #167)
-
Translations
+
Translations
Update Italian translation (GitHub #164, #165)
Update Russian translation (GitHub #166)
@@ -1966,56 +2477,71 @@
Manual
Small Manual tweaks (GitHub #190)
WinMerge 2.16.4 - 2019-07-28
-
File compare
+
File compare
-
BugFix: coretools.cpp: linelen() should not truncate lines with embedded NULs (GitHub #156)
-
BugFix: file compare : right-click doesn't select the diff under the mouse (GitHub #159)
-
BugFix: Avoid an exception in GuessCodepageEncoding() when filepath equals "NUL" (GitHub #162)
+
BugFix: coretools.cpp: linelen() should not truncate lines with
+embedded NULs (GitHub #156)
+
BugFix: file compare : right-click doesn't select the diff under the
+mouse (GitHub #159)
+
BugFix: Avoid an exception in GuessCodepageEncoding() when filepath
+equals "NUL" (GitHub #162)
BugFix: Auto-indent did not work if the EOL-style was not CRLF
-
Folder compare
+
Folder compare
-
BugFix: Generating HTML Folder Compare report including File Compare report did not complete (Bitbucket #15)
-
BugFix: Compare Statistics dialog: The number of diff folders was counted in the number of diff files
+
BugFix: Generating HTML Folder Compare report including File Compare
+report did not complete (Bitbucket #15)
+
BugFix: Compare Statistics dialog: The number of diff folders was
+counted in the number of diff files
Plugins
-
BugFix: PrediffLineFilter.sct: Wrong encoding for settings dialog (Bitbucket #16)
+
BugFix: PrediffLineFilter.sct: Wrong encoding for settings dialog
+(Bitbucket #16)
-
Translations
+
Translations
Update Russian translation (Bitbucket PR #51)
Update Italian translation (Bitbucket PR #52)
-
Internals
+
Internals
-
Favor PathContext::GetSize() over PathContext::size() (GitHub #157)
+
Favor PathContext::GetSize() over PathContext::size() (GitHub
+#157)
Consolidate FolderCmp (GitHub #158, #160, #161)
Avoid some InnoSetup compiler warnings (Bitbucket PR #53)
WinMerge 2.16.3 - 2019-06-29
General
-
BugFix: Slow startup with documents folder redirected to high-latency network drive (Bitbucket #155)
-
Add VisualElementsManifest for Windows 10 start menu (Bitbucket PR #47)
+
BugFix: Slow startup with documents folder redirected to
+high-latency network drive (Bitbucket #155)
+
Add VisualElementsManifest for Windows 10 start menu (Bitbucket PR
+#47)
Reduce the size of the executable file
-
File compare
+
File compare
-
BugFix: Location and Diff pane visibility broken in 2.16.1 (GitHub #138, Bitbucket #163, sf.net #2228)
-
BugFix: Temporary files could not be created (GitHub #143, sf.net #2220)
+
BugFix: Location and Diff pane visibility broken in 2.16.1 (GitHub
+#138, Bitbucket #163, sf.net #2228)
+
BugFix: Temporary files could not be created (GitHub #143, sf.net
+#2220)
BugFix: Trivial bugfix (GitHub #155)
-
BugFix: Regression: Incorrectly shows 'no changes' for large portions of certain binary files! (Bitbucket #162)
+
BugFix: Regression: Incorrectly shows 'no changes' for large
+portions of certain binary files! (Bitbucket #162)
Small tweaks for HTML file reports (Bitbucket PR #44, #45)
-
Made diff algorithm selectable by using libXDiff algorithms: default(Myers), minimal, patience, histogram
+
Made diff algorithm selectable by using libXDiff algorithms:
+default(Myers), minimal, patience, histogram
triple click to select whole line (Bitbucket #144)
Remove extra space in installer: " Launch WinMerge" (sf.net#2144)
-
Add "How to Apply These Terms to Your New Programs" section into GPL.rtf (sf.net#2098)
+
Remove extra space in installer: " Launch WinMerge"
+(sf.net#2144)
+
Add "How to Apply These Terms to Your New Programs" section into
+GPL.rtf (sf.net#2098)
-
Translations
+
Translations
Add Finnish translation (sf.net#3031)
Add Sinhala translation (sf.net#3032)
@@ -2316,14 +2899,16 @@
Translations
Update Portuguese translation (GitHub #56-78)
Update Polish translation (sf.net#2177)
Update Turkish translation (Bitbucket#85, #86)
-
Change the file encodings of all .po files of WinMerge GUI to UTF-8
+
Change the file encodings of all .po files of WinMerge GUI to
+UTF-8
WinMerge 2.15.2 - 2018-01-28
Appearance
Flatten GUI pane edges
Partial support for HiDPI (not Per-Monitor DPI Aware)
-
Remove splash screen. The splash screen image is now displayed in About dialog
+
Remove splash screen. The splash screen image is now displayed in
+About dialog
Tool bar
@@ -2333,69 +2918,98 @@
Tool bar
Open dialog
-
Change window type of Open dialog from modal window to MDI child window
+
Change window type of Open dialog from modal window to MDI child
+window
Add Read-only checkbox to Open dialog
Add buttons to swap items
Add the third path combobox for 3-way comparison
-
Allow file name patterns like not only .ext but file.ext
+
Allow file name patterns like not only .ext but
+file.ext
Tab bar
Make Tabbar reorderable by using drag-and-drop
-
Add "Close Other Tabs", "Close Right Tabs" and "Close Left Tabs" menu items to system menu
+
Add "Close Other Tabs", "Close Right Tabs" and "Close Left Tabs"
+menu items to system menu
Add "Enable Auto Max Width" menu item to Tab Bar context menu
Show close button when hovering over tabs
Add icons to each tab
Options dialog
-
Add "Close Select Files or Folders Dialog on clicking OK button" checkbox to "General" page
-
Add "Language" combobox to "General" page and remove Language dialog
-
Add "Ignore codepage differences" checkbox to "Compare/General" page
-
Remove checkboxes in "Enable multiple compare windows for" group from "General" page (Now always enabled multi compare windows)
+
Add "Close Select Files or Folders Dialog on clicking OK button"
+checkbox to "General" page
+
Add "Language" combobox to "General" page and remove Language
+dialog
+
Add "Ignore codepage differences" checkbox to "Compare/General"
+page
+
Remove checkboxes in "Enable multiple compare windows for" group
+from "General" page (Now always enabled multi compare windows)
Add "Include Subfolders" checkbox to "Compare/Folder" page
-
Add "Automatically expand all subfolders" checkbox to "Compare/Folder" page
+
Add "Automatically expand all subfolders" checkbox to
+"Compare/Folder" page
Add "Ignore Reparse Points" checkbox to "Compare/Folder" page
-
Add "Number of compare threads" textbox to "Compare/Folder" page
+
Add "Number of compare threads" textbox to "Compare/Folder"
+page
Add "Compare/Binary" page
Add "Compare/Image" page
-
Add checkboxes whether to use custom colors for text to "Colors/Differences" page
+
Add checkboxes whether to use custom colors for text to
+"Colors/Differences" page
Add "GitHub/Bitbucket" button to "Colors/Differences" page
Add "Margin" color button to "Colors/Text" page
Add "Colors/Markers" page
-
Remove "Use stand-alone 7-Zip if available" and "Use local 7-Zip from WinMerge folder" radio button from "Archive Support" page (Now always use local 7-Zip from WinMerge folder)
-
Make $file and $linenum parameters available in External editor textbox on "System" page
-
Make Custom codepage on "Codepage" page selectable from dropdown list
-
Add "Detect codepage for text files using mlang.dll" checkbox to "Codepage" page
-
Remove "Include subfolders by default" checkbox from "Shell Integration" page (ShellExtension now refers to "Include subfolders" checkbox on "Compare/Folder" page or on "Select Files or Folders" dialog)
-
Remove "Add Shell menu to context menu" from "Shell Integration" page (WinMerge now always adds shell menu to context menu in Folder window)
-
Add "Register shell extension" button to "Shell Integration" page
-
-
Folder Compare
-
-
Add Multi-thread compare support for Full Contents or Quick Contents method
+
Remove "Use stand-alone 7-Zip if available" and "Use local 7-Zip
+from WinMerge folder" radio button from "Archive Support" page (Now
+always use local 7-Zip from WinMerge folder)
+
Make $file and $linenum parameters available in External editor
+textbox on "System" page
+
Make Custom codepage on "Codepage" page selectable from dropdown
+list
+
Add "Detect codepage for text files using mlang.dll" checkbox to
+"Codepage" page
+
Remove "Include subfolders by default" checkbox from "Shell
+Integration" page (ShellExtension now refers to "Include subfolders"
+checkbox on "Compare/Folder" page or on "Select Files or Folders"
+dialog)
+
Remove "Add Shell menu to context menu" from "Shell Integration"
+page (WinMerge now always adds shell menu to context menu in Folder
+window)
+
Add "Register shell extension" button to "Shell Integration"
+page
+
+
Folder Compare
+
+
Add Multi-thread compare support for Full Contents or Quick Contents
+method
Color the background of items in list view
-
Restore collapse/expand state of folder tree after re-comparison
+
Restore collapse/expand state of folder tree after
+re-comparison
Make comparing window closeable
Make sub-folder re-comparable
Display folder items in list view during comparison
-
Display the file name currently being compared in progress window
+
Display the file name currently being compared in progress
+window
Add "Parent Folder" menu item in 'Open Left/Middle/Right' menu
Add "Compare Non-horizontally" menu item to context menu
Add "Copy items To Clipboard" menu item to context menu
Add "Swap panes" menu item to View menu
Add "Auto/Manual Prediffer" menu item to Plugin menu
-
Open selected folders in new tab when clicking "Compare" menu item with pressing Ctrl key
+
Open selected folders in new tab when clicking "Compare" menu item
+with pressing Ctrl key
Cleanup Date column alignment (GitHub #25)
BugFix: Version column not sorted correctly
-
BugFix: A unique item that is a binary file was not detected as a binary file
-
BugFix: Properly handle 3-way comparison of Binary files (Github #23)
-
BugFix: Use proper font for View>Use Default Font menu item (GitHub #24)
+
BugFix: A unique item that is a binary file was not detected as a
+binary file
+
BugFix: Properly handle 3-way comparison of Binary files (Github
+#23)
+
BugFix: Use proper font for View>Use Default Font menu item
+(GitHub #24)
-
File Compare
+
File Compare
Add support for 3-way compare/merge
-
Add "Diff Context" menu to View menu to adjust the number of displayed diff context lines
+
Add "Diff Context" menu to View menu to adjust the number of
+displayed diff context lines
Add "Split Vertically" menu item to View menu
Add "Add Synchronization Point" to Merge menu
Add "Auto/Manual Prediffer" menu item to Plugin menu
@@ -2406,10 +3020,14 @@
File Compare
Add C++11 keywords
Make merge editor window D&Dable
Highlight the search text and implement Marker
-
Highlight the EOL pane in status bar if there is a difference in the EOL of files
-
Reload files when another application changes files opened by WinMerge
+
Highlight the EOL pane in status bar if there is a difference in the
+EOL of files
+
Reload files when another application changes files opened by
+WinMerge
Improve in-line diff algorithm
-
BugFix: More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).(Bitbucket #1)
+
BugFix: More on Issue #73 Fixed the -dl -dm and -dr description
+parameters for conflict files (for both 2 way and 3 way conflict
+files).(Bitbucket #1)
BugFix: Fix Memory Leak with Drop Targets (GitHub #26)
Binary Compare
@@ -2417,14 +3035,16 @@
Binary Compare
Install binary file editor (frhed) component again by default
BugFix: limiting to single file compare window now works more logically (#1636314)
+
BugFix: limiting to single file compare window now works more
+logically (#1636314)
BugFix: ANSI regular expressions didn't work (#1644668)
Translation updates
@@ -3269,63 +4124,87 @@
WinMerge 2.7.1.6 - 2007-02-01 (r4094)<
Swedish (#1634968)
-
WinMerge 2.7.1.5 - 2007-01-10 (r4030)
+
WinMerge 2.7.1.5 - 2007-01-10
+(r4030)
-
New line filter implementation (please test and report bugs!) (#1593810)
+
New line filter implementation (please test and report bugs!)
+(#1593810)
Minimum height for location pane's visible area (#1489875)
-
Short label "Error" for error items in folder compare (#1567749)
+
Short label "Error" for error items in folder compare
+(#1567749)
BugFix: rename edits wrong field in folder compare (#1597939)
BugFix: too much scrolling in difference navigation
-
BugFix: wrong text selection after pane switch in file compare (#1630630)
+
BugFix: wrong text selection after pane switch in file compare
+(#1630630)
BugFix: crash when editing space-char indented files (#1631613)
Manual updates
-
WinMerge 2.7.1.4 - 2006-12-21 (r3991)
+
WinMerge 2.7.1.4 - 2006-12-21
+(r3991)
Match lines inside differences (#1447744)
-
Workaround-patch (locally included to the build) for shutdown problems (#1602313)
+
Workaround-patch (locally included to the build) for shutdown
+problems (#1602313)
New ASP.Net filefilter (#1619689)
BugFix: folder compare speed regression in 2.7.1.3 (#1610442)
-
BugFix: new fix for folder compare Copy Left/Right To.. (#1603061)
-
BugFix: copyright info missing from about dialog when translation selected (#1604115)
-
BugFix: location pane problems with word-wrap (#1584068, #1611542)
+
BugFix: new fix for folder compare Copy Left/Right To..
+(#1603061)
+
BugFix: copyright info missing from about dialog when translation
+selected (#1604115)
+
BugFix: location pane problems with word-wrap (#1584068,
+#1611542)
BugFix: invalid path added to project file -dialog (#1602219)
Swedish translation update (#1614442)
Manual updates
-
WinMerge 2.7.1.3 - 2006-12-05 (r3919)
+
WinMerge 2.7.1.3 - 2006-12-05
+(r3919)
Now hides skipped items by default (#1604078)
Improved INI file syntax highlighting (#1607193)
Easier folder selection in Project File -dialog (#1603196)
-
New "Exclude Source Control files and directories filter" filefilter (#1557295)
-
BugFix: project files weren't loaded correctly from command line (using shell file association) (#1602214)
+
New "Exclude Source Control files and directories filter" filefilter
+(#1557295)
+
BugFix: project files weren't loaded correctly from command line
+(using shell file association) (#1602214)
BugFix: crash in syntax parser (#1556688)
-
BugFix: wrong difference navigation when word-wrap enabled (#1597814)
-
BugFix: ClearCase integration didn't install if "Program Files" -folder was named differently (non-English Windows)
+
BugFix: wrong difference navigation when word-wrap enabled
+(#1597814)
+
BugFix: ClearCase integration didn't install if "Program Files"
+-folder was named differently (non-English Windows)
Manual updates
Slovak translation update (#1606496)
-
WinMerge 2.7.1.2 - 2006-11-24 (r3844)
+
WinMerge 2.7.1.2 - 2006-11-24
+(r3844)
-
close WinMerge if Open-dialog is canceled when started from command line (#1600714)
-
BugFix: project files didn't work (loaded right-side path for both sides) (#1600000)
-
BugFix: location pane misdrawn when word-wrap enabled (#1584068)
+
close WinMerge if Open-dialog is canceled when started from command
+line (#1600714)
+
BugFix: project files didn't work (loaded right-side path for both
+sides) (#1600000)
+
BugFix: location pane misdrawn when word-wrap enabled
+(#1584068)
-
WinMerge 2.7.1.1 - 2006-11-16 (r3810)
+
WinMerge 2.7.1.1 - 2006-11-16
+(r3810)
-
Use expat + scew for XML handling (partially converted) (1587574)
-
Uses PCRE for regular expressions (partially converted) (#1591605)
+
Use expat + scew for XML handling (partially converted)
+(1587574)
+
Uses PCRE for regular expressions (partially converted)
+(#1591605)
New folder compare icons (#1586705)
New bookmarks icons (#1586689)
-
Manifest files in resource, no need for separate files (#1588212)
+
Manifest files in resource, no need for separate files
+(#1588212)
BugFix: WinMerge/Filters folder was always created (#1578419)
BugFix: modality problems in file selection dialogs (#1586869)
BugFix: crash if file modification time was missing (#1589563)
-
BugFix: /x parameter didn't work with some other parameters (#1564283)
-
BugFix: asked sometimes twice about saving modified files (#1596692)
+
BugFix: /x parameter didn't work with some other parameters
+(#1564283)
+
BugFix: asked sometimes twice about saving modified files
+(#1596692)
For older changes look at the VCS (Version Control System).
diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index c5b1f67d1c1..b13a7af63e8 100644
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -1,5 +1,43 @@
# Change log
+## WinMerge 2.16.34 - 2023-10-27
+
+### File compare
+
+- Allow NUL and \\.\NUL in paths specified as command line arguments (PR #2056)
+- Added "(F4)" to the description of the toolbar icon "Difference in the Current Line". (#2050)
+- Fix a crash problem when the Diff algorithm is set to something other than
+ default and one file does not have an EOL of the last line and the other
+ file has an EOL of the last line.
+
+### Image compare
+
+- BugFix: Fixed the issue where .png is added when saving even if the file
+ format does not use a converter such as jpg or png file.
+
+### Folder compare
+
+- BugFix: Folder compare omits unique folders from results if they contain any
+ files and/or subfolders folder compare/merge (#2046)
+
+### Line filters
+
+- Modify the "Line Filters" dialog. (PR #2047)
+
+### Substitution filters
+
+- Modify the "Substitution Filters" dialog. (PR #2068)
+
+### Translations
+
+- Translation updates:
+ - French (PR #2055,#2058)
+ - Korean (PR #2057,#2059,#2060)
+
+### Internals
+
+- Small code changes for CMDIChildWnd handling (#2043)
+
## WinMerge 2.16.33 - 2023-09-20
### General
diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index 0b8615145c4..f9ca3ca5e88 100644
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -6,81 +6,154 @@
ReleaseNotes
-
+code{white-space: pre-wrap;}
+span.smallcaps{font-variant: small-caps;}
+div.columns{display: flex; gap: min(4vw, 1.5em);}
+div.column{flex: auto; overflow-x: auto;}
+div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+
+ul.task-list[class]{list-style: none;}
+ul.task-list li input[type="checkbox"] {
+font-size: inherit;
+width: 0.8em;
+margin: 0 0.8em 0.2em -1.6em;
+vertical-align: middle;
+}
+.display.math{display: block; text-align: center; margin: 0.5rem auto;}
+
+
-
This is a WinMerge beta release which is meant for preview the current state of WinMerge development. This release is not recommended for the production.
+
This is a WinMerge 2.16.34 stable release. This release replaces
+earlier WinMerge stable releases as a recommended release.
Please submit bug reports to our bug-tracker.
+
What Is New in 2.16.34
+
File compare
+
+
Allow NUL and \.\NUL in paths specified as command line arguments
+(PR #2056)
+
Added "(F4)" to the description of the toolbar icon "Difference in
+the Current Line". (#2050)
+
Fix a crash problem when the Diff algorithm is set to something
+other than default and one file does not have an EOL of the last line
+and the other file has an EOL of the last line.
+
+
Image compare
+
+
BugFix: Fixed the issue where .png is added when saving even if the
+file format does not use a converter such as jpg or png file.
+
+
Folder compare
+
+
BugFix: Folder compare omits unique folders from results if they
+contain any files and/or subfolders folder compare/merge (#2046)
+
+
Line filters
+
+
Modify the "Line Filters" dialog. (PR #2047)
+
+
Substitution filters
+
+
Modify the "Substitution Filters" dialog. (PR #2068)
+
+
Translations
+
+
Translation updates:
+
+
French (PR #2055,#2058)
+
Korean (PR #2057,#2059,#2060)
+
+
+
Internals
+
+
Small code changes for CMDIChildWnd handling (#2043)
+
What Is New in 2.16.33 Beta
General
-
Reduce startup time and decrease the usage of Win32 user objects.
+
Reduce startup time and decrease the usage of Win32 user
+objects.
-
File compare
+
File compare
BugFix: Cannot compare one-line file (#1972)
-
BugFix: "Current Difference" specified by double-clicking cannot merge using the "Copy to Right (or Left)" menu. (#1980)
-
BugFix: Wimerge saves changes to the wrong file (#1985) (PR #1988)
-
BugFix: "Ignore comment differences" still compares inline comments (#2008)
+
BugFix: "Current Difference" specified by double-clicking cannot
+merge using the "Copy to Right (or Left)" menu. (#1980)
+
BugFix: Wimerge saves changes to the wrong file (#1985) (PR
+#1988)
+
BugFix: "Ignore comment differences" still compares inline comments
+(#2008)
[Feature Request] Both Shell Menu (#1986) (PR #2021)
Table compare
-
When "Use First Line as Header" is enabled, make the header display the first line regardless of the scroll position when the first line is hidden.
-
Generate reports in tabular format for table comparisons. (PR #1983)
+
When "Use First Line as Header" is enabled, make the header display
+the first line regardless of the scroll position when the first line is
+hidden.
+
Generate reports in tabular format for table comparisons. (PR
+#1983)
-
Folder compare
+
Folder compare
-
BugFix: Fixed an issue where Differences, Left/Right EOL columns, etc. were displayed as undefined values when the file comparison method was Full Contents or Quick Contents and the file size exceeded 64MB.
-
BugFix: Fix the problem that when comparing with the BinaryContents compare method, the contents of the files are identical, but if one side is a symbolic link, it is judged to be different. (#1976)
-
BugFix: Fixed an issue where values in the Left/Right EOL column may not display correctly when using the Quick contents compare method.
+
BugFix: Fixed an issue where Differences, Left/Right EOL columns,
+etc. were displayed as undefined values when the file comparison method
+was Full Contents or Quick Contents and the file size exceeded
+64MB.
+
BugFix: Fix the problem that when comparing with the BinaryContents
+compare method, the contents of the files are identical, but if one side
+is a symbolic link, it is judged to be different. (#1976)
+
BugFix: Fixed an issue where values in the Left/Right EOL column may
+not display correctly when using the Quick contents compare method.
Add Expand Different Subfolders menu item (#1382) (PR #1964)
-
Allow Diff algorithms (patience, histogram) other than default to be applied to folder comparisons (PR #2015) (#2002)
-
Show confirmation message when closing a window that took a long time to compare folders
+
Allow Diff algorithms (patience, histogram) other than default to be
+applied to folder comparisons (PR #2015) (#2002)
+
Show confirmation message when closing a window that took a long
+time to compare folders
-
Line filters
+
Line filters
-
Improve line filters and substitution filters (PR #2032) (#796) (#1620)
+
Improve line filters and substitution filters (PR #2032) (#796)
+(#1620)
-
Substitution filters
+
Substitution filters
-
Avoid infinite loops in the RegularExpression::subst() function when the length of the string matching the pattern is 0
-
Improve line filters and substitution filters (PR #2032) (#796) (#1620)
+
Avoid infinite loops in the RegularExpression::subst() function when
+the length of the string matching the pattern is 0
+
Improve line filters and substitution filters (PR #2032) (#796)
+(#1620)
Options dialog
-
Execute the "pause" command to prevent the error message from disappearing if the registration of the ShellExtension for Windows 11 fails
+
Execute the "pause" command to prevent the error message from
+disappearing if the registration of the ShellExtension for Windows 11
+fails
Plugins
-
BugFix: WinMerge cannot successfully disable some of its Plugins (#2012)
+
BugFix: WinMerge cannot successfully disable some of its Plugins
+(#2012)
Update jq to version 1.7
Manual
Manual: Use po4a for manual translation (PR #1994) (#499)
-
Translations
+
Translations
Translation updates:
@@ -98,13 +171,14 @@
Translations
Ukrainian (PR #1955)
-
Internals
+
Internals
Optimize inserts in std containers using reserve (PR #2000)
Known issues
-
Suggestion to make the result of image comparison more reliable (#1391)
+
Suggestion to make the result of image comparison more reliable
+(#1391)
Crashes when comparing large files (#325)
Very slow to compare significantly different directories (#322)
Vertical scrollbar breaks after pasting text (#296)
diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index 3e0a78a8c2a..74a2a165e6f 100644
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -1,18 +1,57 @@
-# WinMerge 2.16.33 Beta Release Notes
+# WinMerge 2.16.34 Release Notes
- [About This Release](#about-this-release)
+- [What Is New in 2.16.34?](#what-is-new-in-21634)
- [What Is New in 2.16.33 beta?](#what-is-new-in-21633-beta)
- [Known issues](#known-issues)
-September 2023
+October 2023
## About This Release
-This is a WinMerge beta release which is meant for preview the current state of
-WinMerge development. This release is not recommended for the production.
+This is a WinMerge 2.16.34 stable release.
+This release replaces earlier WinMerge stable releases as a recommended release.
Please submit bug reports to our bug-tracker.
+## What Is New in 2.16.34
+
+### File compare
+
+- Allow NUL and \\.\NUL in paths specified as command line arguments (PR #2056)
+- Added "(F4)" to the description of the toolbar icon "Difference in the Current Line". (#2050)
+- Fix a crash problem when the Diff algorithm is set to something other than
+ default and one file does not have an EOL of the last line and the other
+ file has an EOL of the last line.
+
+### Image compare
+
+- BugFix: Fixed the issue where .png is added when saving even if the file
+ format does not use a converter such as jpg or png file.
+
+### Folder compare
+
+- BugFix: Folder compare omits unique folders from results if they contain any
+ files and/or subfolders folder compare/merge (#2046)
+
+### Line filters
+
+- Modify the "Line Filters" dialog. (PR #2047)
+
+### Substitution filters
+
+- Modify the "Substitution Filters" dialog. (PR #2068)
+
+### Translations
+
+- Translation updates:
+ - French (PR #2055,#2058)
+ - Korean (PR #2057,#2059,#2060)
+
+### Internals
+
+- Small code changes for CMDIChildWnd handling (#2043)
+
## What Is New in 2.16.33 Beta
### General
