mercurial at 21537: 14 new changesets

[Mercurial Commits]

14 new changesets in mercurial:

http://selenic.com/repo/hg//rev/47b97d9af27e
changeset:   21524:47b97d9af27e
user:        Durham Goode <durham at fb.com>
date:        Thu May 08 16:54:23 2014 -0700
summary:     merge: add labels parameter from merge.update to filemerge

http://selenic.com/repo/hg//rev/559f01f19cf6
changeset:   21525:559f01f19cf6
user:        Durham Goode <durham at fb.com>
date:        Fri May 09 18:15:02 2014 -0700
summary:     graft: customize graft conflict markers (BC)

http://selenic.com/repo/hg//rev/3b40e32e88c3
changeset:   21526:3b40e32e88c3
user:        Durham Goode <durham at fb.com>
date:        Thu May 08 16:55:56 2014 -0700
summary:     rebase: specify custom conflict marker labels for rebase (BC)

http://selenic.com/repo/hg//rev/1f05a7bcde50
changeset:   21527:1f05a7bcde50
user:        Durham Goode <durham at fb.com>
date:        Fri May 16 13:15:07 2014 -0700
summary:     help: add local/other description to merge tool description

http://selenic.com/repo/hg//rev/32b9bbca2052
changeset:   21528:32b9bbca2052
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 14:51:53 2014 -0700
summary:     run-tests: pass jobs into TestSuite constructor

http://selenic.com/repo/hg//rev/117e027390ab
changeset:   21529:117e027390ab
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 15:00:54 2014 -0700
summary:     run-tests: move whitelist and blacklist to named arguments of TestSuite

http://selenic.com/repo/hg//rev/78289625e986
changeset:   21530:78289625e986
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 15:03:06 2014 -0700
summary:     run-tests: make retest a named argument of TestSuite.__init__

http://selenic.com/repo/hg//rev/7fcda22acc43
changeset:   21531:7fcda22acc43
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 15:06:23 2014 -0700
summary:     run-tests: make keywords a named argument to TestSuite.__init__

http://selenic.com/repo/hg//rev/9d2ba7e2324d
changeset:   21532:9d2ba7e2324d
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 15:08:03 2014 -0700
summary:     run-tests: move loop to a named argument of TestSuite.__init__

http://selenic.com/repo/hg//rev/aecac8059c00
changeset:   21533:aecac8059c00
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 15:11:38 2014 -0700
summary:     run-tests: make testdir an argument of TestSuite.__init__

http://selenic.com/repo/hg//rev/3ece55d16044
changeset:   21534:3ece55d16044
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Apr 25 15:34:28 2014 -0700
summary:     run-tests: make attributes of TestRunner internal

http://selenic.com/repo/hg//rev/ab7e224bc089
changeset:   21535:ab7e224bc089
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri May 09 15:55:58 2014 -0700
summary:     run-tests: avoid duplicate code in vlog()

http://selenic.com/repo/hg//rev/92a6b16c9186
changeset:   21536:92a6b16c9186
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri May 09 16:13:14 2014 -0700
summary:     run-tests: add docstrings

http://selenic.com/repo/hg//rev/1ab30e9ba0fc
changeset:   21537:1ab30e9ba0fc
tag:         tip
user:        Durham Goode <durham at fb.com>
date:        Fri May 09 18:09:11 2014 -0700
summary:     update: specify custom conflict markers for update (BC)

-- 
Repository URL: http://selenic.com/repo/hg/