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

r1919:8f565af1 default
r4696:59b8f936 default
Show More
map-cmdline.compact
8 lines | 266 B | text/plain | TextLexer
Vadim Gelfer
make --style=compact look for map-cmdline.compact....
r1914 changeset = '{rev}{tags}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n'
Vadim Gelfer
add changeset_quiet to templates.
r1919 changeset_quiet = '{rev}:{node|short}\n'
Vadim Gelfer
make --style=compact look for map-cmdline.compact....
r1914 start_tags = '['
tag = '{tag},'
last_tag = '{tag}]'
start_parents = ':'
parent = '{rev},'
last_parent = '{rev}'