upstream/mercurial-mirror Files · mercurial/templates/monoblue/index.tmpl

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r30765:eb7de21b default


                r38817:bb54db4a

@96 default

Download file

             index.tmpl
        
                    34 lines
            
             | 945 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / index.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

          <title>Mercurial repositories index</title>

      </head>

      <body>

      <div id="container">

          <div class="page-header">

              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h1>

              <ul class="page-nav">

              </ul>

          </div>

          <table cellspacing="0">

              <tr>

                  <td><a href="?sort={sort_name}">Name</a></td>

                  <td><a href="?sort={sort_description}">Description</a></td>

                  <td><a href="?sort={sort_contact}">Contact</a></td>

                  <td><a href="?sort={sort_lastchange}">Last modified</a></td>

                  <td>&nbsp;</td>

                  <td>&nbsp;</td>

              </tr>

              {entries%indexentry}

          </table>

          <div class="page-footer">

              {motd}

          </div>

          <div id="powered-by">

              <p><a href="{logourl}" title="Mercurial"><img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a></p>

          </div>

      </div>

      </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

				{header}
				<title>Mercurial repositories index</title>
				</head>

				<body>
				<div id="container">
				<div class="page-header">
				<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h1>
				<ul class="page-nav">
				</ul>
				</div>

				<table cellspacing="0">
				<tr>
				<td><a href="?sort={sort_name}">Name</a></td>
				<td><a href="?sort={sort_description}">Description</a></td>
				<td><a href="?sort={sort_contact}">Contact</a></td>
				<td><a href="?sort={sort_lastchange}">Last modified</a></td>
				<td> </td>
				<td> </td>
				</tr>
				{entries%indexentry}
				</table>
				<div class="page-footer">
				{motd}
				</div>

				<div id="powered-by">
				<p><a href="{logourl}" title="Mercurial"><img src="{staticurl\|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a></p>
				</div>

				</div>
				</body>
				</html>