##// 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

File last commit:

r9999:f91e5630 default
r39001:cf68e264 default
Show More
header.tmpl
1 line | 86 B | application/x-cheetah | CheetahLexer
<?xml version="1.0" encoding="{encoding}"?>
<feed xmlns="http://www.w3.org/2005/Atom">