##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944
Steven Stallion - - Load All Authors

File last commit:

r16489:cf137319 stable
r38701:b3d0c97a @81 default
Show More
proto
24 lines | 478 B | text/plain | ProtoBufLexer
/ contrib / plan9 / proto
History | Annotation | Raw |Copy content |Copy permalink
lib - sys sys
mercurial - sys sys
hgrc.d - sys sys
9diff.rc - sys sys
factotum.rc - sys sys
rc - sys sys
bin - sys sys
9diff - sys sys
hg - sys sys
sys - sys sys
lib - sys sys
python - sys sys
lib - sys sys
python2.5 - sys sys
site-packages - sys sys
hgext - sys sys
+ - sys sys
mercurial - sys sys
+ - sys sys
mercurial-VERSION-py2.5.egg-info - sys sys
src - sys sys
cmd - sys sys
hg - sys sys
+ - sys sys