diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_subversion | 6 |
2 files changed, 8 insertions, 1 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 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] )) || |