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

File last commit:

r4074:0f9381cf default
r4365:46280c00 default
Show More
test-extension.out
15 lines | 293 B | text/plain | TextLexer
uisetup called
ui.parentui is None
reposetup called for a
ui == repo.ui
Foo
uisetup called
ui.parentui is None
reposetup called for a
ui == repo.ui
reposetup called for b
ui == repo.ui
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
uisetup called
ui.parentui is None
Bar