From a956caa2339ea8ae07765943687925c7c2a836bf Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 26 Jan 2022 14:18:46 +0000
Subject: 49714: _subversion: resolve: Complete conflicted files created by
 merges, too

---
 Completion/Unix/Command/_subversion | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Completion')

diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index cb5cbd374..e9a3d9b1a 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -364,7 +364,11 @@ _svn_uncontrolled() {
 
 (( $+functions[_svn_conflicts] )) ||
 _svn_conflicts() {
-  () { (( $# > 0 )) } $REPLY.(mine|r<->)(NY1)
+  # ### These strings are actually translatable
+  #
+  # The asterisks are to support an optional extension; see
+  # "preserved-conflict-file-exts" in ~/.subversion/config.
+  () { (( $# > 0 )) } $REPLY.(mine|r<->|working*|merge-left*|merge-right*)(NY1)
 }
 
 (( $+functions[_svn_modified] )) ||
-- 
cgit 1.4.1