summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution
Commit message (Expand)AuthorAge
* Added a comment: Customise conflict resolution behaviourGravatar https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w2014-02-25