upstream/mercurial-mirror Files · mercurial/templates/rss/error.tmpl

merge: check for conflicting actions irrespective of length of bids...

merge: check for conflicting actions irrespective of length of bids We should for whether bids contain a combination of actions which conflict with each other. Since right now we only have couple of such combination, and combinations also consist of two actions, we were checking for them only when length of bids is 2. Let's check that irrespective of the length of bids.

Matt Mackall - - Load All Authors

File last commit:

r26421:4b0fc75f default


                r46207:588068d5

default

Download file

             error.tmpl
        
                    10 lines
            
             | 241 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / rss / error.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

          <title>Error</title>

          <description>Error</description>

          <item>

            <title>Error</title>

            <description>{error|escape}</description>

        Matt Mackall
    
urls: bulk-change primary website URLs

              r26421
            
            <guid>https://mercurial-scm.org/#error</guid>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          </item>

        </channel>

      </rss>

	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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>Error</title>
		<description>Error</description>
		<item>
		<title>Error</title>
		<description>{error\|escape}</description>
Matt Mackall urls: bulk-change primary website URLs	r26421	<guid>https://mercurial-scm.org/#error</guid>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</item>
		</channel>
		</rss>