##// END OF EJS Templates
tests: add merge test for changeset 9fe267f77f56...
tests: add merge test for changeset 9fe267f77f56 When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.

File last commit:

r4084:51e52db6 default
r4696:59b8f936 default
Show More
header.tmpl
10 lines | 470 B | application/x-cheetah | CheetahLexer
Content-type: text/html; charset={encoding}
<?xml version="1.0" encoding="{encoding}"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
<head>
<link rel="icon" href="{staticurl}hgicon.png" type="image/png">
<meta name="robots" content="index, nofollow"/>
<link rel="stylesheet" href="{staticurl}style-gitweb.css" type="text/css" />