← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/zen.txt

  • Committer: Gordon Tyler
  • Date: 2010-05-03 04:51:58 UTC
  • mto: This revision was merged to the branch mainline in revision 5207.
  • Revision ID: gordon@doxxx.net-20100503045158-q9smvxm7oelm8nm5
Fixed preservation of existing line endings and added tests for that and Unicode handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/zen.txt
56
56
  102: Add code and tests for X
57
57
  101: Add tests for Y
58
58
  100: ...
59
 
  
 
59
 
60
60
Many teams use this approach because their tools make branching and merging
61
61
difficult. As a consequence, developers update from and commit to the trunk
62
62
frequently, minimizing integration pain by spreading it over every commit.