~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/merge.txt

  • Committer: Martin Pool
  • Date: 2005-05-03 07:57:06 UTC
  • Revision ID: mbp@sourcefrog.net-20050503075706-8162f11e1c000c57
- allow trace file to grow up to 4MB

Show diffs side-by-side

added added

removed removed

Lines of Context: