2 commits

Author	SHA1	Message	Date
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	715c67a3e5	git diff-tree interface	2012-12-10 14:36:57 -04:00