Joey Hess 53dbcce645 direct mode merging works! ... Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files.		2012-12-18 15:04:44 -04:00
..
Direct.hs	direct mode merging works!	2012-12-18 15:04:44 -04:00