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

r1790:88f0345d default
r4696:59b8f936 default
Show More
hgicon.png
0 lines | 593 B | image/png | TextLexer
/ templates / static / hgicon.png
rendered-image