Rev 4709: killed-both and killed-base is 11 chars long. in http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0-40412-show-base-weave

------------------------------------------------------------
revno: 4709
revision-id: john at arbash-meinel.com-20091204003251-67jf15ez18n9b3th
parent: john at arbash-meinel.com-20091203230611-gl12umcgjj6f0o0f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-40412-show-base-weave
timestamp: Thu 2009-12-03 18:32:51 -0600
message:
  killed-both and killed-base is 11 chars long.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2009-10-27 09:45:35 +0000
+++ b/bzrlib/merge.py	2009-12-04 00:32:51 +0000
@@ -1431,7 +1431,7 @@
             plan = list(plan)
             trans_id = self.tt.trans_id_file_id(file_id)
             name = self.tt.final_name(trans_id) + '.plan'
-            contents = ('%10s|%s' % l for l in plan)
+            contents = ('%11s|%s' % l for l in plan)
             self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
         textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
             '>>>>>>> MERGE-SOURCE\n')