summaryrefslogtreecommitdiff
path: root/Command/Direct.hs
Commit message (Expand)AuthorAge
* partial and incomplete automatic merging in direct modeGravatar Joey Hess2012-12-18
* direct mode merging works!Gravatar Joey Hess2012-12-18
* add ok'sGravatar Joey Hess2012-12-13
* added direct and indirect commandsGravatar Joey Hess2012-12-13