~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-reference/conflicts.txt

move reference material out of User Guide into User Reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Conflicts types
 
1
Conflicts Types
2
2
===============
3
3
 
4
4
Some operations, like merge, revert and pull, modify the contents of your