/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Ian Clatworthy
  • Date: 2007-12-05 05:19:20 UTC
  • mfrom: (3066.4.1 bzr.quick-start-tweaks)
  • mto: This revision was merged to the branch mainline in revision 3079.
  • Revision ID: ian.clatworthy@internode.on.net-20071205051920-zj97muk7k5pzjne9
Quick Start Card tweaks including fix for #165080 (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
53
53
 
54
54
Note that some merges can only be completed with the assistance
55
55
of a human. Details on how to resolve these are given in
56
 
`Resolving conflicts <resolving_conflicts.html>`_.
 
56
`Resolving conflicts`_.
57
57
 
58
58
Recording a merge
59
59
-----------------