diff options
| author | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
| commit | 4131a59d1a57d53bf711115317116a6c57483636 (patch) | |
| tree | c3b2a746fdc18708b4c18b33c4475f20bf9d4e61 /plugins/mercurial/mercurial.plugin.zsh | |
| parent | 3913106b2e7127d396f27b652df812340ec0c871 (diff) | |
| parent | 08632bb1780d51f6748b5c09ef5232862313f78f (diff) | |
| download | zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.gz zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.bz2 zsh-4131a59d1a57d53bf711115317116a6c57483636.zip | |
Merge pull request #2827 from ncanceill/easymerge
...you folks are amazing. :-)
"Easy-to-merge"
Diffstat (limited to 'plugins/mercurial/mercurial.plugin.zsh')
| -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 |