From a6b6b650fbd4e5c024c86cd3964e518ff2dafa3e Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Fri, 29 Nov 2019 01:45:17 +0000
Subject: 44946: _subversion: Make _svn_conflicts not offer all files in the
 directory.

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

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
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index b5532b101..04a8da0bf 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -337,7 +337,7 @@ _svn_controlled() {
 
 (( $+functions[_svn_conflicts] )) ||
 _svn_conflicts() {
-  [ -n $REPLY.(mine|r<->)(N[1]) ]
+  () { (( $# > 0 )) } $REPLY.(mine|r<->)(NY1)
 }
 
 (( $+functions[_svn_deletedfiles] )) ||
-- 
cgit 1.4.1