/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: Canonical.com Patch Queue Manager
  • Date: 2008-01-03 23:18:14 UTC
  • mfrom: (3146.5.4 test-merge-uncommitted)
  • Revision ID: pqm@pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
Make merge --uncommitted work with merge-type weave/lca (abentley)

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
-----------------