summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_4_80539e11e36a0b64cee83b6b373bd843._comment
Commit message (Expand)AuthorAge
* Added a comment: merge for master branch?Gravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-03-23