# 
# 
# patch "ChangeLog"
#  from [0f5c6836ed94161f359a96b83b0818c6252a8ed7]
#    to [4ce17cf890b330654a50dc12c047f67328ca01ed]
# 
# patch "HACKING"
#  from [2d70798fc515faf275cf6e817cfef4f76e1f4b39]
#    to [54335ea1fe81e8117366e5a82c5e56d86ba951cc]
# 
============================================================
--- ChangeLog	0f5c6836ed94161f359a96b83b0818c6252a8ed7
+++ ChangeLog	4ce17cf890b330654a50dc12c047f67328ca01ed
@@ -1,3 +1,7 @@
+2006-01-19  Matt Johnston  <address@hidden>
+
+	* HACKING: escape the colon in the cino vim modeline option.
+
 2006-01-19  Nathaniel Smith  <address@hidden>
 
 	* database.cc (check_format): Small cleanups to previous change.
============================================================
--- HACKING	2d70798fc515faf275cf6e817cfef4f76e1f4b39
+++ HACKING	54335ea1fe81e8117366e5a82c5e56d86ba951cc
@@ -18,7 +18,7 @@
 
 And something close (but not perfect) for VIM:
 
-vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
+vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
 
 monotone's source includes a number of third party libraries.  These have
 been imported from upstream, and should retain the original coding style of