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

merge: don't ignore conflicting file in remote renamed directory...

merge: don't ignore conflicting file in remote renamed directory When the remote side has renamed a directory from a/ to b/ and added a file b/c in it, and the local side has added a file a/c, we end up moving a/c to b/c without considering the remote version of b/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename ('dm') action.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r23475:67f1d688

default

Download file

             header.tmpl
        
                    7 lines
            
             | 458 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / header.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">

      <head>

      <link rel="icon" href="{staticurl|urlescape}hgicon.png" type="image/png" />

      <meta name="robots" content="index, nofollow" />

      <link rel="stylesheet" href="{staticurl|urlescape}style-paper.css" type="text/css" />

      <script type="text/javascript" src="{staticurl|urlescape}mercurial.js"></script>

	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

				<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
				<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
				<head>
				<link rel="icon" href="{staticurl\|urlescape}hgicon.png" type="image/png" />
				<meta name="robots" content="index, nofollow" />
				<link rel="stylesheet" href="{staticurl\|urlescape}style-paper.css" type="text/css" />
				<script type="text/javascript" src="{staticurl\|urlescape}mercurial.js"></script>