##// END OF EJS Templates
patch: remove applydiff() useless updatedir and rejmerge arguments
r7147:94cf0d1f default
Show More
test-merge4.out
4 lines | 194 B | text/plain | TextLexer
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)