Support additional mercurial aliases

More analogue to git for mercurial.
This commit is contained in:
William Carroll 2019-05-13 16:39:22 +01:00
parent 940ea173f6
commit c41e9fe49c
2 changed files with 4 additions and 1 deletions

View file

@ -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"

View file

@ -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 }')"
}