merge: add labels parameter from merge.update to filemerge

Adds a labels function parameter to all the functions between merge.update and
filemerge.filemerge. This will allow commands like rebase to specify custom
marker labels.

--HG--
extra : rebase_source : dec5e0bdba2a98dffffeff73b6194de3558adf5c
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.

--HG--
extra : rebase_source : 28a0d8dad8679b9b9bc6091baac6c931a5306c0c
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

--HG--
extra : rebase_source : 383ba9de1ce2f7b1ce621af59aeb4c47380abbe0
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.

--HG--
extra : rebase_source : bdc28168de0673369ea604cfd2d2d11971e03a4f
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.

--HG--
extra : rebase_source : cf6deb68ab6d47782a83d017b3ab16d8852db708
run-tests: move whitelist and blacklist to named arguments of TestSuite

--HG--
extra : rebase_source : 040155b01a5d980aa17ad1d61a78a29ac88f4351
run-tests: make retest a named argument of TestSuite.__init__

--HG--
extra : rebase_source : d33fc2b6fdc69ad837412db612a92dac376a6081
run-tests: make keywords a named argument to TestSuite.__init__

This was the last usage of option in ``TextTestRunner.run``.

--HG--
extra : rebase_source : 9290dbacd9390613e09e5f86a1ca1683712456f8
run-tests: move loop to a named argument of TestSuite.__init__

--HG--
extra : rebase_source : ca984660e309f20393621e224a7fce365787c433
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.

--HG--
extra : rebase_source : 8d08f4d73a6f3ef20188d4f95ba890257bc771a7
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.

--HG--
extra : rebase_source : aa29ba28fcd31e8e30717c66a84a1d2a771d56f1
run-tests: avoid duplicate code in vlog()

--HG--
extra : rebase_source : c08fd1364e94ba3ad6efe9b64f467d7766f2862f
run-tests: add docstrings

--HG--
extra : rebase_source : b0e693247434bc70c94b89a3aa3f971125b43500
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.

--HG--
extra : rebase_source : 63c3014d89ccc998da6fca896304c0f098da6eb6