/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_generate_docs.py

  • Committer: Martin von Gagern
  • Date: 2011-09-19 08:42:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6148.
  • Revision ID: martin.vgagern@gmx.net-20110919084237-ck2r99f2ic7m2wxj
Rename --include-sidelines to --include-merged.

This better matches phrases used in existing code and docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_generate_docs.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
from cStringIO import StringIO
24
24
 
25
25
import bzrlib.commands
26
 
from bzrlib.tests import TestCase, TestSkipped
 
26
from bzrlib.tests import TestCase
27
27
 
28
28
 
29
29
class Options: