/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/resolving_conflicts.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-07-01 15:17:33 UTC
  • mto: (4498.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4501.
  • Revision ID: v.ladeuil+lp@free.fr-20090701151733-i34hbbl7e2e1ta2o
Fixed as per John's review.

* bzrlib/tests/blackbox/test_send.py:
(load_tests): Delete spurious spaces in dict() definition.
(TestSendStrictWithChanges.setUp): Clarify the intent and mean of
the parametrization.

* bzrlib/send.py:
(send): Oops, fix the error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/resolving_conflicts.txt
35
35
each file in question, fixing the relevant areas and removing the
36
36
conflict markers as you go.
37
37
 
38
 
After fixing all the files in conflict, and removing the markers,
 
38
After fixing all the files in conflict, and removing the markers, 
39
39
ask Bazaar to mark them as resolved using the ``resolve`` command like this::
40
40
 
41
41
  bzr resolve