# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 1549319343 28800
# Node ID 61415361e90684a8c7a031413e9182f51937c2e7
# Parent  8185c8abce87b305920bca9ec26ccbfd11279436
zsh: fix `hg resolve` completion when in a subdirectory (issue6067)

Differential Revision: https://phab.mercurial-scm.org/D5836

diff -r 8185c8abce87 -r 61415361e906 contrib/zsh_completion
--- 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)