##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

zsh: fix `hg resolve` completion when in a subdirectory (issue6067)...
Kyle Lippincott -
r41830:61415361 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -248,7 +248,7 b' typeset -A _hg_cmd_globals'
248
248
249 [[ -d $PREFIX ]] || PREFIX=$PREFIX:h
249 [[ -d $PREFIX ]] || PREFIX=$PREFIX:h
250
250
251 _hg_cmd resolve -l ./$PREFIX | while read rstate rpath
251 _hg_cmd resolve -l ./$PREFIX -T '{mergestatus}\ {relpath\(path\)}\\n' | while read rstate rpath
252 do
252 do
253 [[ $rstate == 'R' ]] && resolved_files+=($rpath)
253 [[ $rstate == 'R' ]] && resolved_files+=($rpath)
254 [[ $rstate == 'U' ]] && unresolved_files+=($rpath)
254 [[ $rstate == 'U' ]] && unresolved_files+=($rpath)
General Comments 0
You need to be logged in to leave comments. Login now