upstream/mercurial-mirror Files · mercurial/templates/paper/diffstat.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.

Alexander Plavin - - Load All Authors

File last commit:

r19455:c229a5e7 default


                r23475:67f1d688

default

Download file

             diffstat.tmpl
        
                    8 lines
            
             | 341 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / diffstat.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        <tr>

          <td class="diffstat-file"><a href="#l{fileno}.1">{file|escape}</a></td>

          <td class="diffstat-total" align="right">{total}</td>

          <td class="diffstat-graph">

            <span class="diffstat-add" style="width:{addpct}%;">&nbsp;</span>

            <span class="diffstat-remove" style="width:{removepct}%;">&nbsp;</span>

          </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="diffstat-file"><a href="#l{fileno}.1">{file\|escape}</a></td>
				<td class="diffstat-total" align="right">{total}</td>
				<td class="diffstat-graph">
				<span class="diffstat-add" style="width:{addpct}%;"> </span>
				<span class="diffstat-remove" style="width:{removepct}%;"> </span>
				</td>
				</tr>