##// 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:

r3277:105253b3 default
r4696:59b8f936 default
Show More
map
8 lines | 205 B | text/plain | TextLexer
Thomas Arendsen Hein
Moved hgweb map-* files into their style directories and adjusted them.
r3277 default = 'changelog'
header = header.tmpl
changelog = changelog.tmpl
changelogentry = changelogentry.tmpl
filelog = filelog.tmpl
filelogentry = filelogentry.tmpl
tags = tags.tmpl
tagentry = tagentry.tmpl