Skip to content
Browse files

Add a command to show unresolve files in merge

  • Loading branch information...
1 parent 67d74cb commit f82092a0e78985287c6eb1746234db688bb1a98f Chris Krycho committed with ncanceill
Showing with 2 additions and 0 deletions.
  1. +2 −0 plugins/mercurial/mercurial.plugin.zsh
2 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

0 comments on commit f82092a

Please sign in to comment.
Something went wrong with that request. Please try again.