summaryrefslogtreecommitdiff
path: root/Git/DiffTree.hs
Commit message (Collapse)AuthorAge
* direct mode merging works!Gravatar Joey Hess2012-12-18
| | | | | Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files.
* git diff-tree interfaceGravatar Joey Hess2012-12-10