Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:17:20 -0700] rev 6523
test-imerge: disable due to massive brokenness
Dov Feldstern <dfeldstern@fastimap.com> [Fri, 04 Apr 2008 02:21:53 +0300] rev 6522
use internal merge tool when specified for a merge-pattern in hgrc
It is possible to specify in the hgrc file that one of the internal merge
tools (internal:fail, internal:local or internal:other) be used for
performing merges on files matching a given pattern. However, this setting
is not being acted upon (the merge tool is not found). This patch fixes that.
Dov Feldstern <dfeldstern@fastimap.com> [Fri, 04 Apr 2008 02:20:58 +0300] rev 6521
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Apr 2008 22:41:07 -0400] rev 6520
fix import with -p0
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:08:03 +0200] rev 6519
context: handle untracked files in filectx.fileflags()
Matt Mackall <mpm@selenic.com> [Fri, 11 Apr 2008 12:52:56 -0500] rev 6518
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve