Update changelog&releasenotes (2)

diff --git a/Docs/Users/ChangeLog.html b/Docs/Users/ChangeLog.html
index 81fb5f1..260f23a 100644 (file)
--- a/Docs/Users/ChangeLog.html
+++ b/Docs/Users/ChangeLog.html
@@ -33,6 +33,7 @@
 <li>BugFix: Fix PHP syntax highlighting. (PR #782, PR #802)</li>
 <li>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.</li>
 <li>BugFix: The edited contents were discarded when the &quot;Recompare As&quot; menu item was selected after editing the file</li>
+<li>BugFix: Incorrect comparison (#834) (This bug occured when enabling both the &#39;Ignore blank lines&#39; option and the &#39;Completely unhighlight the ignored differences&#39; option.)</li>
 <li>Add Smarty syntax highlighting. (PR #821)</li>
 <li>Thicken the caret in overwrite mode (osdn.net #42179)</li>
 </ul>

diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index 2fe9526..fc1c521 100644 (file)
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -16,6 +16,9 @@
     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)
 

diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index 4d75b9d..c89a6c9 100644 (file)
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -42,6 +42,7 @@
 <li>BugFix: Fix PHP syntax highlighting. (PR #782, PR #802)</li>
 <li>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.</li>
 <li>BugFix: The edited contents were discarded when the &quot;Recompare As&quot; menu item was selected after editing the file</li>
+<li>BugFix: Incorrect comparison (#834) (This bug occured when enabling both the &#39;Ignore blank lines&#39; option and the &#39;Completely unhighlight the ignored differences&#39; option.)</li>
 <li>Add Smarty syntax highlighting. (PR #821)</li>
 <li>Thicken the caret in overwrite mode (osdn.net #42179)</li>
 </ul>

diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index 9e58189..64fc0c1 100644 (file)
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -29,6 +29,9 @@ Please submit bug reports to our <a href="http://github.com/winmerge/winmerge/is
     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)