f82092a0e78985287c6eb1746234db688bb1a98f

Author
Chris Krycho <github@chriskrycho.com>
Committer
ncanceill <nicolas.canceill@ens-cachan.org>
Date

Message

Add a command to show unresolve files in merge

Diff

 1diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
 2index 2e99a12fbdc3b484f93ab186387896b8337c7ceb..ff95d5e40093d796783c2a72e0a8226dcc2d6ec2 100644
 3--- a/plugins/mercurial/mercurial.plugin.zsh
 4+++ b/plugins/mercurial/mercurial.plugin.zsh
 5@@ -16,6 +16,8 @@ alias hgs='hg status'
 6 alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 7 # this is the 'git commit --amend' equivalent
 8 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 9+# list unresolved files (since hg does not list unmerged files in the status command)
10+alias hgun='hg resolve --list'
11 
12 function in_hg() {
13   if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then