##// END OF EJS Templates
change tests to use simplemerge by default
change tests to use simplemerge by default

File last commit:

r2175:b2ae81a7 default
r4365:46280c00 default
Show More
test-pull-permission.out
11 lines | 335 B | text/plain | TextLexer
/ tests / test-pull-permission.out
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions