diff options
| author | William Carroll <wpcarro@gmail.com> | 2019-05-13T15·39+0100 |
|---|---|---|
| committer | William Carroll <wpcarro@gmail.com> | 2019-05-13T15·39+0100 |
| commit | c41e9fe49c059ee0545f6f6867a50a33766fcb67 (patch) | |
| tree | 0a7da6b8e64b580d5b01a55f754e67e19f762875 /configs/shared/zsh/functions.zsh | |
| parent | 940ea173f6c9288ec9b673372ad6d051d428b532 (diff) | |
Support additional mercurial aliases
More analogue to git for mercurial.
Diffstat (limited to 'configs/shared/zsh/functions.zsh')
| -rw-r--r-- | configs/shared/zsh/functions.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
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 }')" } |