#
#
# patch "NEWS"
#  from [62c9fba9f8020d5bbbdd53d1e0c1c3546eeaee95]
#    to [c4ab613de1b6087a6f5a1d790feb7428416c4fa4]
#
============================================================
--- NEWS	62c9fba9f8020d5bbbdd53d1e0c1c3546eeaee95
+++ NEWS	c4ab613de1b6087a6f5a1d790feb7428416c4fa4
@@ -47,7 +47,14 @@ Wed Feb 28 22:02:43 UTC 2007
 
 	New features
 
-	- "mtn merge_into_workspace" (still to be documented)
+	- "mtn merge_into_workspace" (still to be documented).  This command
+	  will allow you to review and fix up a merge in your workspace
+	  before committing it to the repository.  However, the conflict
+	  resolution interface remains the same as that of the 'merge'
+	  command for now (i.e. monotone will invoke your specified merge
+	  tool on all files with conflicts and you must resolve them as they
+	  are presented).  Work on in-workspace conflict presentation and
+	  resolution is planned for the future.
 
 	- "mtn log" will now print an ASCII revision graph alongside the
 	  usual log text.