Wed, 21 Apr 2010 12:02:51 -0500 | David Champion | give worst-case 'merge' merge-tool lowest priority | changeset | files |
Wed, 21 Apr 2010 11:57:45 -0500 | David Champion | merge: tool.premerge=keep will leave premerge markers in $local | changeset | files |
Tue, 11 May 2010 20:22:37 +0200 | Benoit Boissinot | merge with mpm | changeset | files |
Tue, 11 May 2010 20:21:25 +0200 | Benoit Boissinot | merge with stable | changeset | files |
Tue, 11 May 2010 20:13:52 +0200 | Benoit Boissinot | context: fallback function should not return None | changeset | files |
Mon, 10 May 2010 22:52:28 +0200 | Patrick Mezard | test-subrepo-svn: fix strange svn behaviour on windows | changeset | files |
Mon, 10 May 2010 22:46:16 +0200 | Patrick Mezard | tests: force color ansi mode on Windows | changeset | files |