4 commits

Author	SHA1	Message	Date
Joey Hess	6d71a9b68e	mention automatic merge conflict resolution	2013-07-09 14:22:54 -04:00
Øyvind A. Holm	e1139c9a01	doc/sync.mdwn: Typo fix ... 5c945f18-2ba1-11e2-8d66-00c0a8deee11	2012-11-11 02:44:32 +01:00
https://www.google.com/accounts/o8/id?id=AItOawl_x1UcmuSOmX7WkBTJPQwOP1FgUPdWEWM	d7e696f38c	fixed typo: repositry	2012-07-28 21:09:23 +00:00
Joey Hess	b538f45faf	add a sync page documenting sync in detail	2011-12-30 20:02:55 -04:00