Rev 3091: (Alexander Belchenko) topic for criss-cross should have title, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3091
revision-id:pqm at pqm.ubuntu.com-20071207033029-7tx9ezbg3nlk3io1
parent: pqm at pqm.ubuntu.com-20071207023811-u12axtixpjmsmfqr
parent: bialix at ukr.net-20071205215635-8v0c9xaesck3wfbb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-12-07 03:30:29 +0000
message:
  (Alexander Belchenko) topic for criss-cross should have title,
  	otherwise autogenerated bzr_man has problems
modified:
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3079.1.1
    revision-id:bialix at ukr.net-20071205215635-8v0c9xaesck3wfbb
    parent: pqm at pqm.ubuntu.com-20071205060118-l1gg524ng5twr0uw
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: criss-cross
    timestamp: Wed 2007-12-05 23:56:35 +0200
    message:
      topic for criss-cross should have title, otherwise autogenerated bzr_man has problems.
    modified:
      bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
=== modified file 'bzrlib/help_topics.py'
--- a/bzrlib/help_topics.py	2007-12-06 17:52:30 +0000
+++ b/bzrlib/help_topics.py	2007-12-07 03:30:29 +0000
@@ -552,7 +552,8 @@
 """
 
 _criss_cross = \
-"""
+"""Criss-Cross
+
 A criss-cross in the branch history can cause the default merge technique
 to emit more conflicts than would normally be expected.