log

age author description
Tue, 01 Dec 2015 09:48:38 -0800 Siddharth Agarwal filemerge: default regular prompts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
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()
Sat, 28 Nov 2015 16:46:31 +0800 Anton Shestakov webcommands: stop using ersatz if-else ternary operator for rename variable
Sat, 28 Nov 2015 16:02:22 +0800 Anton Shestakov webcommands: get correct parents when comparing a removed file (issue4962)