Add a command to show unresolve files in merge

iokto · Jun 7, 2014 · f82092a · f82092a
1 parent 67d74cb
commit f82092a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
@@ -16,6 +16,8 @@ alias hgs='hg status'
 alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
+# list unresolved files (since hg does not list unmerged files in the status command)
+alias hgun='hg resolve --list'
 
 function in_hg() {
  if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then