##// END OF EJS Templates
status: advertise --abort instead of 'update -C .' to abort a merge...
status: advertise --abort instead of 'update -C .' to abort a merge status has a part where it shows the conflict information and how to continue or abort. Couple of release ago, we got merge --abort and we should advertise that instead of 'hg update -C .' which is kind of ugly. I know we need to unify the logic here. Differential Revision: https://phab.mercurial-scm.org/D4168
Pulkit Goyal -
r39001:cf68e264 default
Show More
Name Size Modified Last Commit Author
/ hgext
convert
fsmonitor
highlight
infinitepush
largefiles
lfs
narrow
zeroconf
__init__.py Loading ...
absorb.py Loading ...
acl.py Loading ...
amend.py Loading ...
automv.py Loading ...
beautifygraph.py Loading ...
blackbox.py Loading ...
bugzilla.py Loading ...
censor.py Loading ...
children.py Loading ...
churn.py Loading ...
clonebundles.py Loading ...
commitextras.py Loading ...
eol.py Loading ...
extdiff.py Loading ...
factotum.py Loading ...
fetch.py Loading ...
fix.py Loading ...
githelp.py Loading ...
gpg.py Loading ...
graphlog.py Loading ...
hgk.py Loading ...
histedit.py Loading ...
journal.py Loading ...
keyword.py Loading ...
logtoprocess.py Loading ...
mq.py Loading ...
notify.py Loading ...
pager.py Loading ...
patchbomb.py Loading ...
purge.py Loading ...
rebase.py Loading ...
record.py Loading ...
releasenotes.py Loading ...
relink.py Loading ...
remotenames.py Loading ...
schemes.py Loading ...
share.py Loading ...
shelve.py Loading ...
show.py Loading ...
sparse.py Loading ...
split.py Loading ...
strip.py Loading ...
transplant.py Loading ...
uncommit.py Loading ...
win32mbcs.py Loading ...
win32text.py Loading ...