# 
# 
# patch "ChangeLog"
#  from [3f6e81d07abf72c1a7358c43a9a020d8b2cbfd2b]
#    to [35166224366f1439b917c55a99d0c82b9902f716]
# 
# patch "monotone.texi"
#  from [76eeb435b2a929791c4e5e306450ef8ef48a3da2]
#    to [ae3cdce4c5063e2b37186e7c3f67b56ed13f2582]
# 
============================================================
--- ChangeLog	3f6e81d07abf72c1a7358c43a9a020d8b2cbfd2b
+++ ChangeLog	35166224366f1439b917c55a99d0c82b9902f716
@@ -1,3 +1,7 @@
+2006-03-08  Matt Johnston  <address@hidden>
+
+	* monotone.texi: mention merge_into_dir in the pivot_root description.
+
 2006-03-08  Matthew Gregan  <address@hidden>
 
 	* tests/t_sink_has_extra_epochs.at: Er, and also check for branch
============================================================
--- monotone.texi	76eeb435b2a929791c4e5e306450ef8ef48a3da2
+++ monotone.texi	ae3cdce4c5063e2b37186e7c3f67b56ed13f2582
@@ -4038,7 +4038,7 @@
 @item monotone pivot_root [--execute] pivot_root @var{new_root} @var{put_old}
 Most users will never need this command.  It is primarily useful in
 certain tricky cases where one wishes to combine several projects
-into one, or split one project into several.
+into one, or split one project into several. See also @command{merge_into_dir}.
 
 Its effect is to rename the directory whose name is currently
 @var{new_root} to become the root directory of the versioned tree, and