1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97a2ef86d..09ac0641f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-29  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 44946: Completion/Unix/Command/_subversion: Make _svn_conflicts
+	not offer all files in the directory.
+
 2019-11-26  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* 44912: Completion/Base/Completer/_expand: Don't set done_quote=1