[Pkg-bazaar-commits] ./bzr/unstable r812: - rename control file to pending-merges

[Martin Pool]

------------------------------------------------------------
revno: 812
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-07-04 17:34:19 +1000
message:
  - rename control file to pending-merges
modified:
  doc/formats.txt
-------------- next part --------------
=== modified file 'doc/formats.txt'
--- a/doc/formats.txt	2005-06-15 09:24:48 +0000
+++ b/doc/formats.txt	2005-07-04 07:34:19 +0000
@@ -98,9 +98,9 @@
   include merges add to this file; lines are never removed or
   reordered.
 
-``pending-merge-patches``
-  List of foreign patches that have been merged and are waiting to be
-  committed. 
+``pending-merges`` 
+  List (one per line) of non-mainline revisions that
+  have been merged and are waiting to be committed.
 
 ``branch-name``
   User-qualified name of the branch, for the purpose of describing the