2 commits

Author	SHA1	Message	Date
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc	667ba2bbb9	Added a comment: Use automatic merge without syncing	2014-03-20 10:03:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w	cb91f3c86a	Added a comment: Customise conflict resolution behaviour	2014-02-25 11:42:08 +00:00