diff options
| author | Chris Krycho <github@chriskrycho.com> | 2013-10-18 09:23:27 -0400 |
|---|---|---|
| committer | ncanceill <nicolas.canceill@ens-cachan.org> | 2014-06-07 23:12:32 +0200 |
| commit | f82092a0e78985287c6eb1746234db688bb1a98f (patch) | |
| tree | 7b002c2a76d6c1b421f895d2c0d46370d30a844d /plugins/mercurial | |
| parent | 67d74cbc2d057ef8ae2d237f739b53f52919567f (diff) | |
| download | zsh-f82092a0e78985287c6eb1746234db688bb1a98f.tar.gz zsh-f82092a0e78985287c6eb1746234db688bb1a98f.tar.bz2 zsh-f82092a0e78985287c6eb1746234db688bb1a98f.zip | |
Add a command to show unresolve files in merge
Diffstat (limited to 'plugins/mercurial')
| -rw-r--r-- | plugins/mercurial/mercurial.plugin.zsh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh index 2e99a12fb..ff95d5e40 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 |