##// 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-lock-badness.out
5 lines | 160 B | text/plain | TextLexer
/ tests / test-lock-badness.out
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 adding a
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
fix backtrace printed when cannot get lock....
r2016 adding b
pushing to ../a
abort: could not lock repository ../a: Permission denied