*** empty log message ***

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 75a13fb9f05cd90284b23e24c4d56b295677aa54..23a00c4959407c5c715523963b3a55dcb9c015ef 100644 (file)
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -87,11 +87,18 @@ meaning to add (the default), remove, or reset the tags.
 
 ** To merge bugs:
 Eg when bad replies create a bunch of new bugs for the same report.
-Bugs must all be in the same state.
+Bugs must all be in the same state, but need not have the same tags.
 
   To: control@emacsbugs.donarmstrong.com
   merge 123 124 125 ...
 
+** Forcing a merge:
+Like `merge', but bugs need not be in the same state.  The first one
+listed is the master.
+
+  To: control@emacsbugs.donarmstrong.com
+  forcemerge 123 124 125 ...
+
 ** To set severity:
 
   To: control@emacsbugs.donarmstrong.com