upstream/mercurial-mirror Files · mercurial/templates/static/style-extra-coal.css

dirstate: fix restoration of "merged" state after a remove...

dirstate: fix restoration of "merged" state after a remove Before this change, "merged" file that get removed and re-added later were recorded as "from_p2" instead. This came from 8fe74328f700, a 2014 changeset that start explicitly doing so for reason I have not been able to fully grasp. The graft test mentioned in the description are still happy after this changeset. So this changeset restore what seems to be the intended behavior. Restoring information as it was before the removal. Differential Revision: https://phab.mercurial-scm.org/D11429

av6 - - Load All Authors

File last commit:

r26284:c258f4d2 default


                r48803:87b3010c

default

Download file

             style-extra-coal.css
        
                    46 lines
            
             | 608 B
            
                | text/css
            
             |
                CssLexer
            
             / mercurial / templates / static / style-extra-coal.css
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      body {

          background: black url('background.png') repeat-x;

      }

      .container {

          padding-left: 0;

          padding-right: 150px;

      }

      .main {

          padding: 2em;

          border-right: 15px solid black;

          border-bottom: 15px solid black;

      }

      .menu {

          background: #999;

          padding: 10px;

          width: 75px;

          position: fixed;

          top: 27px;

          left: auto;

          right: 27px;

      }

      .menu ul {

          border-left: 0;

      }

      .menu li.active {

          font-weight: normal;

          background: black;

          color: white;

      }

      .menu li.active a {

          color: white;

      }

      h3 {

          margin-top: -.7em;

      }

      div.description {

          border-left-width: 3px;

      }

	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

				body {
				background: black url('background.png') repeat-x;
				}

				.container {
				padding-left: 0;
				padding-right: 150px;
				}

				.main {
				padding: 2em;
				border-right: 15px solid black;
				border-bottom: 15px solid black;
				}

				.menu {
				background: #999;
				padding: 10px;
				width: 75px;
				position: fixed;
				top: 27px;
				left: auto;
				right: 27px;
				}

				.menu ul {
				border-left: 0;
				}

				.menu li.active {
				font-weight: normal;
				background: black;
				color: white;
				}

				.menu li.active a {
				color: white;
				}

				h3 {
				margin-top: -.7em;
				}

				div.description {
				border-left-width: 3px;
				}