浏览代码

Add a command to show unresolve files in merge

Chris Krycho 10 年之前
父节点
当前提交
f82092a0e7
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      plugins/mercurial/mercurial.plugin.zsh

+ 2 - 0
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