summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_6_8a0860fee88f5954918305f055a39d8d._comment
Commit message (Expand)AuthorAge
* Added a comment: auto conflict resolution master branchGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-04-13