upstream/mercurial-mirror Files · mercurial/templates/paper/filelogentry.tmpl

resolve: don't abort resolve -l even when no merge is in progress...

resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.

Alexander Plavin - - Load All Authors

File last commit:

r19454:f4a3b50a default


                r21541:6062593d

default

Download file

             filelogentry.tmpl
        
                    5 lines
            
             | 339 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / filelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

       <tr>

        <td class="age">{date|rfc822date}</td>

        <td class="author">{author|person}</td>

        <td class="description"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename}</td>

       </tr>

	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

				<tr>
				<td class="age">{date\|rfc822date}</td>
				<td class="author">{author\|person}</td>
				<td class="description"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{desc\|strip\|firstline\|escape\|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename}</td>
				</tr>