Sean Farley <sean.michael.farley@gmail.com> [Fri, 15 Nov 2013 22:57:11 -0500] rev 20019
run-tests: remove files that we potentially create outside of $TMPDIR
Sean Farley <sean.michael.farley@gmail.com> [Fri, 15 Nov 2013 22:56:08 -0500] rev 20018
run-tests: remove code that creates a dummy 'diffstat'
This was introduced in fb1d7a42663c for an old test that is no longer the same.
Matthew Turk <matthewturk@gmail.com> [Fri, 15 Nov 2013 18:08:50 -0500] rev 20017
template: change extras to use showlist rather than manual templ call.
This enables start_extras and end_extras in template maps.
Matthew Turk <matthewturk@gmail.com> [Fri, 15 Nov 2013 18:09:02 -0500] rev 20016
help: adding example 'extras' printing to 'hg help templates'
Matthew Turk <matthewturk@gmail.com> [Fri, 15 Nov 2013 16:53:54 -0500] rev 20015
help: document about {extras} template keyword
This adds text about the "extras" template keyword, similar to that proposed by
Yuya Nishihara previously.
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 14:50:12 +0100] rev 20014
check-code: document last ignore regexp
For easier remembering to delete when it is not needed anymore.
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 14:49:05 +0100] rev 20013
check-code: drop unneeded ignore patterns
The exceptions seem to have disappeared.
Matt Mackall <mpm@selenic.com> [Sat, 16 Nov 2013 12:44:28 -0500] rev 20012
merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 16 Nov 2013 12:34:05 -0500] rev 20011
merge with i18n
Durham Goode <durham@fb.com> [Fri, 15 Nov 2013 13:20:49 -0800] rev 20010
contrib: add editmerge script for editor conflict prompts
Adds a script that opens the editor to the conflict as part of the merge
process. This way you can fix the merge during the rebase instead of having to
pause the rebase, resolve --mark, rebase --continue.
Only works on unix.