diff options
Diffstat (limited to 'Completion/Unix/Command/_subversion')
| -rw-r--r-- | Completion/Unix/Command/_subversion | 6 |
1 files changed, 5 insertions, 1 deletions
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] )) || |