/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/help_topics.py

  • Committer: Aaron Bentley
  • Date: 2007-12-06 17:52:30 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 3089.
  • Revision ID: abentley@panoramicfeedback.com-20071206175230-tpie138cj9z92yp5
Add debugging flag for merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
272
272
-Dhpss         Trace smart protocol requests and responses.
273
273
-Dindex        Trace major index operations.
274
274
-Dlock         Trace when lockdir locks are taken or released.
 
275
-Dmerge        Emit information for debugging merges.
275
276
"""
276
277
 
277
278
_standard_options = \