run-tests: assign value to ESCAPEMAP - dict.update do not return self a36cc85a5b7b did more than what the description said and introduced a bug.

run-tests: fix invalid reference to stringescape after a36cc85a5b7b

update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.

run-tests: add docstrings

run-tests: avoid duplicate code in vlog()

run-tests: make attributes of TestRunner internal There is little reason for the data members of TestRunner to be public, as they are implementation details. Enforce it through naming.

run-tests: make testdir an argument of TestSuite.__init__ With this change, TestSuite no longer accesses anything on TestRunner and the TestRunner is no longer passed to TestSuite.

run-tests: move loop to a named argument of TestSuite.__init__

run-tests: make keywords a named argument to TestSuite.__init__ This was the last usage of option in ``TextTestRunner.run``.

run-tests: make retest a named argument of TestSuite.__init__

run-tests: move whitelist and blacklist to named arguments of TestSuite

run-tests: pass jobs into TestSuite constructor This starts a series of patches that will lessen the importance of TestRunner. It will remove the TestRunner instance stored inside the TestSuite.

help: add local/other description to merge tool description Adds a more detailed description of what 'local' and 'other' mean to the merge tool documentation.

rebase: specify custom conflict marker labels for rebase (BC) Changes rebase conflict markers to say 'source' and 'dest' instead of 'local' and 'other'. This ends up looking like: one <<<<<<< dest: a3e5c7fd master - bob: "A commit to master" master ======= mine >>>>>>> source: c7fda3e5 - durham: "A commit to my feature branch" three

graft: customize graft conflict markers (BC) Changes the graft conflict markers to be 'graft' and 'local' to make it more intuitive which side is which.