aboutsummaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution.mdwn
Commit message (Expand)AuthorAge
* git-annex (5.20131127) unstable; urgency=lowGravatar Joey Hess2013-11-27