log

age author description
Mon, 10 May 2010 11:04:56 -0500 David Champion merge: tool.check = prompt will force an interactive merge check
Mon, 10 May 2010 11:04:56 -0500 David Champion merge: introduce tool.check parameter
Wed, 21 Apr 2010 12:02:51 -0500 David Champion give worst-case 'merge' merge-tool lowest priority
Wed, 21 Apr 2010 11:57:45 -0500 David Champion merge: tool.premerge=keep will leave premerge markers in $local
Tue, 11 May 2010 20:22:37 +0200 Benoit Boissinot merge with mpm
Tue, 11 May 2010 20:21:25 +0200 Benoit Boissinot merge with stable
Tue, 11 May 2010 20:13:52 +0200 Benoit Boissinot context: fallback function should not return None stable