2 commits

Author	SHA1	Message	Date
Joey Hess	fac8198a2f	fix up old comments that used format=txt, which is no longer enabled	2014-03-20 12:09:09 -04: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