log

age author description
Mon, 30 Nov 2015 11:17:18 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to regular prompts
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Sat, 28 Nov 2015 17:06:29 +0800 Anton Shestakov webcommands: test that fctx is not None in filediff()