##// END OF EJS Templates
merge with upstream
merge with upstream

File last commit:

r2175:b2ae81a7 default
r2423:f328e8ae merge default
Show More
test-merge2.out
5 lines | 225 B | text/plain | TextLexer
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
r767 adding b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
r767 adding b