about summary refs log tree commit diff
path: root/configs/shared/zsh/aliases.zsh
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2019-05-13T15·39+0100
committerWilliam Carroll <wpcarro@gmail.com>2019-05-13T15·39+0100
commitc41e9fe49c059ee0545f6f6867a50a33766fcb67 (patch)
tree0a7da6b8e64b580d5b01a55f754e67e19f762875 /configs/shared/zsh/aliases.zsh
parent940ea173f6c9288ec9b673372ad6d051d428b532 (diff)
Support additional mercurial aliases
More analogue to git for mercurial.
Diffstat (limited to 'configs/shared/zsh/aliases.zsh')
-rw-r--r--configs/shared/zsh/aliases.zsh3
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/shared/zsh/aliases.zsh b/configs/shared/zsh/aliases.zsh
index e86667fc2f3f..9491969c005f 100644
--- a/configs/shared/zsh/aliases.zsh
+++ b/configs/shared/zsh/aliases.zsh
@@ -131,6 +131,9 @@ alias hgd='hg diff'
 alias hgsh='hg export'
 alias hgco='hg update'
 alias hgls='hg citc --list' # should have different output from `pils`
+alias hgrc='hg rebase --continue'
+alias hgra='hg rebase --abort'
+alias hgconflicts="hg resolve --list 'set:unresolved()'" # much like `gconflicts`
 
 # Haskell
 alias sb="stack build"