log

age author description
Tue, 24 Nov 2015 21:17:26 -0800 Gregory Szorc setup: remove unused py_modules argument to setup()
Mon, 23 Nov 2015 13:45:56 -0800 Siddharth Agarwal test-merge-changedelete.t: add resolve --list output
Mon, 23 Nov 2015 13:43:14 -0800 Siddharth Agarwal test-merge-changedelete.t: add a file with regular merge conflicts