##// END OF EJS Templates
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

File last commit:

r38032:e5d2248d default
r38701:b3d0c97a @81 default
Show More
distribution.xml
19 lines | 805 B | application/xml | XmlLexer
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<title>Mercurial SCM</title>
<organization>org.mercurial-scm</organization>
<options customize="never" require-scripts="false" rootVolumeOnly="true" />
<welcome file="Welcome.html" mime-type="text/html" />
<license file="../../../COPYING" mime-type="text/plain" />
<readme file="Readme.html" mime-type="text/html" />
<pkg-ref id="org.mercurial-scm.mercurial"
version="0"
auth="root"
onConclusion="none">mercurial.pkg</pkg-ref>
<choices-outline>
<line choice="org.mercurial-scm.mercurial"/>
</choices-outline>
<choice id="org.mercurial-scm.mercurial" visible="false">
<pkg-ref id="org.mercurial-scm.mercurial"/>
</choice>
</installer-gui-script>