upstream/mercurial-mirror Files · contrib/packaging/macosx/Welcome.html

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

Gregory Szorc - - Load All Authors

File last commit:

r38032:e5d2248d default


                r38701:b3d0c97a

@81 default

Download file

             Welcome.html
        
                    20 lines
            
             | 794 B
            
                | text/html
            
             |
                HtmlLexer
            
             / contrib / packaging / macosx / Welcome.html
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

      <!-- This is the first screen displayed during the install. -->

      <html>

      <head>

        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

        <meta http-equiv="Content-Style-Type" content="text/css">

        <title></title>

        <style type="text/css">

          p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}

          p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}

        </style>

      </head>

      <body>

      <p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p>

      <p class="p2"><br></p>

      <br>

      <p>

      Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p>

      </body>

      </html>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
				<!-- This is the first screen displayed during the install. -->
				<html>
				<head>
				<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
				<meta http-equiv="Content-Style-Type" content="text/css">
				<title></title>
				<style type="text/css">
				p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
				p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
				</style>
				</head>
				<body>
				<p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p>
				<p class="p2"><br></p>
				<br>
				<p>
				Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p>
				</body>
				</html>