← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/en/conflicts.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-01-04 17:14:56 UTC
  • mfrom: (4597.2.18 cleanup)
  • mto: This revision was merged to the branch mainline in revision 4930.
  • Revision ID: v.ladeuil+lp@free.fr-20100104171456-7ko1aczmbw9t8rm1
Cleanup conflicts docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/conflicts.txt
204
204
  Conflict: FILE.new is not a directory, but has files in it.
205
205
  Created directory.
206
206
 
207
 
This happens when one side has added files to a directory, and the othe side
 
207
This happens when one side has added files to a directory, and the other side
208
208
has changed the directory into a file or symlink.  For example::
209
209
 
210
210
  $ bzr init