David Champion <dgc@uchicago.edu> [Wed, 21 Apr 2010 12:02:51 -0500] rev 11147
give worst-case 'merge' merge-tool lowest priority
Another tool had -10 already. Since 'merge' is clearly a worst-case
tool (internal), lowering to -100 ensures there's plenty of room for
slightly better cases.
David Champion <dgc@uchicago.edu> [Wed, 21 Apr 2010 11:57:45 -0500] rev 11146
merge: tool.premerge=keep will leave premerge markers in $local
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 11 May 2010 20:22:37 +0200] rev 11145
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 11 May 2010 20:21:25 +0200] rev 11144
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 11 May 2010 20:13:52 +0200] rev 11143
context: fallback function should not return None
Patrick Mezard <pmezard@gmail.com> [Mon, 10 May 2010 22:52:28 +0200] rev 11142
test-subrepo-svn: fix strange svn behaviour on windows
I got a full path when pusing the external like:
Sending C:/foo/bar/test-subrepo-svn/sub/t/s/alpha
instead of the relative path
Patrick Mezard <pmezard@gmail.com> [Mon, 10 May 2010 22:46:16 +0200] rev 11141
tests: force color ansi mode on Windows
Patrick Mezard <pmezard@gmail.com> [Mon, 10 May 2010 21:44:00 +0200] rev 11140
acl: improve undefined group error handling
Patrick Mezard <pmezard@gmail.com> [Mon, 10 May 2010 21:15:12 +0200] rev 11139
test-acl: avoid $HGTMP on windows
sed does not like colons and there are other path normalization issues.
Patrick Mezard <pmezard@gmail.com> [Mon, 10 May 2010 21:09:48 +0200] rev 11138
acl: grp module is not available on windows