summaryrefslogtreecommitdiff
path: root/Annex/Direct.hs
Commit message (Expand)AuthorAge
...
* normalise associated filesGravatar Joey Hess2012-12-19
* partial and incomplete automatic merging in direct modeGravatar Joey Hess2012-12-18
* direct mode merging works!Gravatar Joey Hess2012-12-18
* direct mode committingGravatar Joey Hess2012-12-12