# 
# 
# patch "ChangeLog"
#  from [ddb2d659ad09085dd3217d9d85b1eecf770ebea9]
#    to [63fe6897c2eeb502ec762f0c47df1d4d5ec4aa3c]
# 
# patch "roster.cc"
#  from [6df282421f592efa3dc67c0e889a1d8abc480fbd]
#    to [0ce52ff8f27920c2ab72a6536600c7516ad9297e]
# 
============================================================
--- ChangeLog	ddb2d659ad09085dd3217d9d85b1eecf770ebea9
+++ ChangeLog	63fe6897c2eeb502ec762f0c47df1d4d5ec4aa3c
@@ -1,3 +1,8 @@
+2006-06-24  Marcel van der Boom  <address@hidden>
+
+	* roster.cc (update_current_roster_from_filesystem): Change
+	'monotone' to 'mtn' in an error message.  
+
 2006-06-24  Thomas Moschny <address@hidden>
 
 	* contrib/monotone.zsh_completion: Replace references to
============================================================
--- roster.cc	6df282421f592efa3dc67c0e889a1d8abc480fbd
+++ roster.cc	0ce52ff8f27920c2ab72a6536600c7516ad9297e
@@ -2230,8 +2230,8 @@
       "to restore consistency, on each missing file run either\n"
       "'%s drop FILE' to remove it permanently, or\n"
       "'%s revert FILE' to restore it\n"
-      "or to handle all at once, simply 'monotone drop --missing'\n"
-      "or 'monotone revert --missing'")
+      "or to handle all at once, simply 'myn drop --missing'\n"
+      "or 'mtn revert --missing'")
     % missing_files % app.prog_name % app.prog_name % app.prog_name);
 }