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

bookmarks: resolve divergent bookmark when moving across a branch...

bookmarks: resolve divergent bookmark when moving across a branch This patch resolves a single divergent bookmark if a divergent bookmark exists in the target revision and it current bookmark is not an ancestor of the target revision, else it would already be handled by the previous patch in this series. Test coverage is added.

Dirkjan Ochtman - - Load All Authors

File last commit:

r8936:1de6e7e1 default


                r19111:6439d78e

stable

Download file

             Welcome.html
        
                    20 lines
            
             | 801 B
            
                | text/html
            
             |
                HtmlLexer
            
             / contrib / 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 second 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="http://mercurial.selenic.com/">Mercurial</a> for Mac OS X.</p>

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

      <br>

      <p>

      Please be sure to read the latest <a href="http://mercurial.selenic.com/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 second 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="http://mercurial.selenic.com/">Mercurial</a> for Mac OS X.</p>
				<p class="p2"><br></p>
				<br>
				<p>
				Please be sure to read the latest <a href="http://mercurial.selenic.com/wiki/WhatsNew">release notes</a>.</p>
				</body>
				</html>