linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add a command to show unresolve files in merge

Browse source
This commit is contained in:
Chris Krycho 2013-10-18 09:23:27 -04:00
commit 067908698b
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mercurial/mercurial.plugin.zsh
View file

@ -15,6 +15,8 @@ alias hgp='hg push'
alias hgs='hg status' alias hgs='hg status'
# this is the 'git commit --amend' equivalent # this is the 'git commit --amend' equivalent
alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip' 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() { function in_hg() {
if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then