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