Mercurial > hg
changeset 41681:61415361e906
zsh: fix `hg resolve` completion when in a subdirectory (issue6067)
Differential Revision: https://phab.mercurial-scm.org/D5836
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Mon, 04 Feb 2019 14:29:03 -0800 |
| parents | 8185c8abce87 |
| children | 1ab6f5df263e |
| files | contrib/zsh_completion |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/zsh_completion Sun Feb 03 19:10:39 2019 +0530 +++ b/contrib/zsh_completion Mon Feb 04 14:29:03 2019 -0800 @@ -248,7 +248,7 @@ [[ -d $PREFIX ]] || PREFIX=$PREFIX:h - _hg_cmd resolve -l ./$PREFIX | while read rstate rpath + _hg_cmd resolve -l ./$PREFIX -T '{mergestatus}\ {relpath\(path\)}\\n' | while read rstate rpath do [[ $rstate == 'R' ]] && resolved_files+=($rpath) [[ $rstate == 'U' ]] && unresolved_files+=($rpath)