summaryrefslogtreecommitdiff
path: root/Annex/VariantFile.hs
Commit message (Collapse)AuthorAge
* sync: Fix bug in direct mode that caused a file not checked into git to be ↵Gravatar Joey Hess2014-03-03
deleted when merging with a remote that added a file by the same name. (Thanks, jkt)