Rev 2928: Typo in conflicts.txt (bug #156015) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/ Patch Queue Manager pqm at
Tue Oct 23 04:05:49 BST 2007

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

revno: 2928
revision-id: pqm at
parent: pqm at
parent: john at
committer: Patch Queue Manager <pqm at>
branch nick: +trunk
timestamp: Tue 2007-10-23 04:05:47 +0100
  Typo in conflicts.txt (bug #156015)
  doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
    revno: 2927.1.1
    merged: john at
    parent: pqm at
    committer: John Arbash Meinel <john at>
    branch nick: jam-integration
    timestamp: Mon 2007-10-22 21:19:37 -0500
      Typo in conflicts.txt (bug #156015)
=== modified file 'doc/en/user-guide/conflicts.txt'
--- a/doc/en/user-guide/conflicts.txt	2007-08-10 05:17:09 +0000
+++ b/doc/en/user-guide/conflicts.txt	2007-10-23 02:19:37 +0000
@@ -169,6 +169,6 @@
 It is possible (though very rare) for Bazaar to raise a MalformedTransform
-exception.  This means that Bazaar encounted a filesystem conflict that it was
+exception.  This means that Bazaar encountered a filesystem conflict that it was
 unable to resolve.  This usually indicates a bug.  Please let us know if you
 encounter this.  Our bug tracker is at

More information about the bazaar-commits mailing list