Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
f82092a0
Commit
f82092a0
authored
Oct 18, 2013
by
Chris Krycho
Committed by
ncanceill
Jun 07, 2014
Browse files
Add a command to show unresolve files in merge
parent
67d74cbc
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/mercurial/mercurial.plugin.zsh
View file @
f82092a0
...
@@ -16,6 +16,8 @@ alias hgs='hg status'
...
@@ -16,6 +16,8 @@ alias hgs='hg status'
alias
hgsl
=
'hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
alias
hgsl
=
'hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
# 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment