From f82092a0e78985287c6eb1746234db688bb1a98f Mon Sep 17 00:00:00 2001
From: Chris Krycho <github@chriskrycho.com>
Date: Fri, 18 Oct 2013 09:23:27 -0400
Subject: [PATCH] Add a command to show unresolve files in merge

---
 plugins/mercurial/mercurial.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 2e99a12f..ff95d5e4 100644
--- 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