Matt Mackall <mpm@selenic.com> [Fri, 11 Sep 2015 12:48:09 -0700] rev 26226
hgweb: drop unused import
Augie Fackler <augie@google.com> [Thu, 10 Sep 2015 13:45:00 -0400] rev 26225
help/config: back out 5f2a1ebd6e78
This breaks building manpages, and by association breaks building
debs. timeless has a fix coming, but it turns out we'll need to back
out 5f2a1ebd6e78 anyway, so just back it out now to fix building
packages.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Thu, 10 Sep 2015 09:41:11 -0400] rev 26224
filemerge: add non-interactive :merge-local and :merge-other
There are two non-interactive internal merge tools, :other and :local,
but they don't really merge, they just pick all changes from the local
or other version of the file. In some situations, it is known that we
want a merge and also know that all merge conflicts should be resolved
in one direction. Although external merge tools can do this, sometimes
it can be convenient to do so from within hg, without invoking a merge
tool. These new :merge-local and :merge-other tools can do just that.