log

age author description
Tue, 11 Nov 2014 20:32:10 -0800 Gregory Szorc docker: add Docker files for running an Apache mod_wsgi server
Mon, 24 Nov 2014 16:17:02 -0800 Martin von Zweigbergk merge: use None as filename for base in 'both created' conflicts
Mon, 24 Nov 2014 16:42:36 -0800 Martin von Zweigbergk merge: break out "both renamed a -> b" case
Mon, 24 Nov 2014 16:16:34 -0800 Martin von Zweigbergk merge: separate out "both created" cases
Mon, 24 Nov 2014 16:11:22 -0800 Martin von Zweigbergk merge: indent to prepare for next patch
Tue, 25 Nov 2014 17:30:05 -0600 Matt Mackall merge with stable