← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/resolving_conflicts.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/resolving_conflicts.txt
35
35
each file in question, fixing the relevant areas and removing the
36
36
conflict markers as you go.
37
37
 
38
 
After fixing all the files in conflict, and removing the markers, 
 
38
After fixing all the files in conflict, and removing the markers,
39
39
ask Bazaar to mark them as resolved using the ``resolve`` command like this::
40
40
 
41
41
  bzr resolve