From c41e9fe49c059ee0545f6f6867a50a33766fcb67 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Mon, 13 May 2019 16:39:22 +0100
Subject: Support additional mercurial aliases

More analogue to git for mercurial.
---
 configs/shared/zsh/aliases.zsh   | 3 +++
 configs/shared/zsh/functions.zsh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'configs/shared')

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"
diff --git a/configs/shared/zsh/functions.zsh b/configs/shared/zsh/functions.zsh
index b72ca582d639..4eede030466c 100644
--- a/configs/shared/zsh/functions.zsh
+++ b/configs/shared/zsh/functions.zsh
@@ -127,7 +127,7 @@ org_capture() {
 }
 
 # Git
-conflicts() {
+gconflicts() {
   # Edit git conflicts one-by-one in your favorite editor.
   ${EDITOR} "$(git status --porcelain | awk '/^UU/ { print $2 }')"
 }
-- 
cgit 1.4.1