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

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

Gregory Szorc - - Load All Authors

File last commit:

r30765:eb7de21b default


                r32057:e5ffc91a

stable

Download file

             footer.tmpl
        
                    17 lines
            
             | 486 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / footer.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

          <div class="page-footer">

              <p>Mercurial Repository: {repo|escape}</p>

              <ul class="rss-logo">

                  <li><a href="{url|urlescape}rss-log">RSS</a></li>

                  <li><a href="{url|urlescape}atom-log">Atom</a></li>

              </ul>

              {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

				<div class="page-footer">
				<p>Mercurial Repository: {repo\|escape}</p>
				<ul class="rss-logo">
				<li><a href="{url\|urlescape}rss-log">RSS</a></li>
				<li><a href="{url\|urlescape}atom-log">Atom</a></li>
				</ul>
				{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>