4 commits

Author	SHA1	Message	Date
Joey Hess	05ec4587dd	partial and incomplete automatic merging in direct mode ... Handles our file right, but not theirs.	2012-12-18 17:15:16 -04:00
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
Joey Hess	44402159dd	add ok's	2012-12-13 16:02:10 -04:00
Joey Hess	5df3c66a85	added direct and indirect commands	2012-12-13 15:44:56 -04:00