summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 15e3a9999..d2598a8ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2022-01-29 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * 49714: Completion/Unix/Command/_subversion: resolve: Complete
+ conflicted files created by merges, too
+
* 49713: Completion/Unix/Command/_subversion: commit, diff,
revert: Update completions for svn 1.7 and newer