Update ChangeLog&ReleaseNotes (3)

WinMerge · Mar 20, 2023 · 3bb4e7b · 3bb4e7b
1 parent 71ad193
commit 3bb4e7b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/Docs/Users/ChangeLog.html b/Docs/Users/ChangeLog.html
@@ -21,20 +21,28 @@
 </head>
 <body>
 <h1 id="change-log">Change log</h1>
-<h2 id="winmerge-21629---2023-03-20">WinMerge 2.16.29 - 2023-03-20</h2>
+<h2 id="winmerge-21629---2023-03-21">WinMerge 2.16.29 - 2023-03-21</h2>
 <h3 id="file-compare">File compare</h3>
 <ul>
 <li>BugFix: 3-way compare does not properly align identical lines when resolving conflicts, and show false highlights (#1696)</li>
 <li>BugFix: Failure to indent lines properly (#1740)</li>
+<li>BugFix: Fixed problems with non-default Diff algorithm:
+<ul>
+<li>Even though the Ignore carriage return differences option was disabled, EOL differences were ignored when the option to ignore whitespace differences was enabled.</li>
+<li>Differences between CR and CR+LF were not ignored even though Ignore carriage return differences option was enabled.</li>
+</ul></li>
+<li>BugFix: Fixed a bug with Match whole word only options of Substitution filters</li>
 <li>Add MATLAB syntax highlighting. (PR #1766)</li>
 </ul>
 <h3 id="table-compare">Table compare</h3>
 <ul>
 <li>The &quot;View &gt; Wrap Lines&quot; menu item in the Table Compare window is now &quot;Wrap Text&quot; and its check status is saved separately from the same menu item in the Text Compare window. (osdn #47553)</li>
+<li>Added an option to change the CSV file separator from comma to semicolon or another character.</li>
 </ul>
 <h3 id="binary-compare">Binary compare</h3>
 <ul>
 <li>BugFix: Resizing WinMerge Window looses the correct scroll position for the memory address your cursor is at (WinMerge/frhed #13)</li>
+<li>BugFix: Fixed an issue where an infinite loop occurred when the file size was truncated during file loading.</li>
 </ul>
 <h3 id="image-compare">Image compare</h3>
 <ul>

diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
@@ -1,24 +1,36 @@
 # Change log
 
-## WinMerge 2.16.29 - 2023-03-20
+## WinMerge 2.16.29 - 2023-03-21
 
 ### File compare
 
 - 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.
+- 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.
 
 ### 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.
 
 ### Image compare
 

diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
@@ -35,15 +35,23 @@ <h3 id="file-compare">File compare</h3>
 <ul>
 <li>BugFix: 3-way compare does not properly align identical lines when resolving conflicts, and show false highlights (#1696)</li>
 <li>BugFix: Failure to indent lines properly (#1740)</li>
+<li>BugFix: Fixed problems with non-default Diff algorithm:
+<ul>
+<li>Even though the Ignore carriage return differences option was disabled, EOL differences were ignored when the option to ignore whitespace differences was enabled.</li>
+<li>Differences between CR and CR+LF were not ignored even though Ignore carriage return differences option was enabled.</li>
+</ul></li>
+<li>BugFix: Fixed a bug with Match whole word only options of Substitution filters</li>
 <li>Add MATLAB syntax highlighting. (PR #1766)</li>
 </ul>
 <h3 id="table-compare">Table compare</h3>
 <ul>
 <li>The &quot;View &gt; Wrap Lines&quot; menu item in the Table Compare window is now &quot;Wrap Text&quot; and its check status is saved separately from the same menu item in the Text Compare window. (osdn #47553)</li>
+<li>Added an option to change the CSV file separator from comma to semicolon or another character.</li>
 </ul>
 <h3 id="binary-compare">Binary compare</h3>
 <ul>
 <li>BugFix: Resizing WinMerge Window looses the correct scroll position for the memory address your cursor is at (WinMerge/frhed #13)</li>
+<li>BugFix: Fixed an issue where an infinite loop occurred when the file size was truncated during file loading.</li>
 </ul>
 <h3 id="image-compare">Image compare</h3>
 <ul>

diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
@@ -20,18 +20,30 @@ Please submit bug reports to our bug-tracker.
 - 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.
+- 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.
 
 ### 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.
 
 ### Image compare