← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-16 14:45:48 UTC
  • mto: (6437.35.1 2.5.0-dev)
  • mto: This revision was merged to the branch mainline in revision 6439.
  • Revision ID: v.ladeuil+lp@free.fr-20120116144548-48mob8d7dee824uc
Tags: bzr-2.5b5
Release 2.5b5

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4168
4168
    Merge will do its best to combine the changes in two branches, but there
4169
4169
    are some kinds of problems only a human can fix.  When it encounters those,
4170
4170
    it will mark a conflict.  A conflict means that you need to fix something,
4171
 
    before you should commit.
 
4171
    before you can commit.
4172
4172
 
4173
4173
    Use bzr resolve when you have fixed a problem.  See also bzr conflicts.
4174
4174