From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 25 May 2021 14:08:29 +0000 (-0400)
Subject: improve changelog
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~91^2~335^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7029ef1c3d4e3b5ce31548ab591d06294607d244;p=git-annex.git

improve changelog
---

diff --git a/CHANGELOG b/CHANGELOG
index 417847ed47..2296541109 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@ git-annex (8.20210429) UNRELEASED; urgency=medium
 
   * drop --auto: When two files have the same content, and a preferred content
     expression matches one but not the other, do not drop the content.
+  * sync --content, assistant: When two unlocked files have the same
+    content, and a preferred content expression matches one but not the
+    other, do not drop the content. (This was already the case for locked
+    files.)
   * sync --content, assistant: Fix an edge case where a file that is not
     preferred content did not get dropped.
   * filter-branch: New command, useful to produce a filtered version of the