summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment
Commit message (Expand)AuthorAge
* Added a comment: Use automatic merge without syncingGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-03-20