aboutsummaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment
Commit message (Expand)AuthorAge
* fix up old comments that used format=txt, which is no longer enabledGravatar Joey Hess2014-03-20
* Added a comment: Customise conflict resolution behaviourGravatar https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w2014-02-25