Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 20:51:26 +0200] rev 6530
merge: replace readline() call, missing from posixfile_nt
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:34:01 +0200] rev 6529
Merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Apr 2008 20:03:54 +0200] rev 6528
remove trailing whitespace introduced in cfeeac24fc1e
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 12 Apr 2008 06:37:38 +0300] rev 6527
templates/coal: spell class correctly in {fileentry}
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:52 -0700] rev 6526
repo: add rjoin method
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:51 -0700] rev 6525
parseurl: make revs optional
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:18:38 -0700] rev 6524
Hoist localpath to the top level
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.