summaryrefslogtreecommitdiff
path: root/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn
Commit message (Expand)AuthorAge
* sync: When there are merge conflicts that get automatically resolved, exit no...Gravatar Joey Hess2013-11-07
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n482013-11-07