/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-11-18 16:02:53 UTC
  • mto: This revision was merged to the branch mainline in revision 4808.
  • Revision ID: v.ladeuil+lp@free.fr-20091118160253-11zt6hr4luwpw0ur
Fix babune failures, most probably due to jam's fix for the http slowness on windows.

* test_http.py:
(TestProxyHttpServer.setUp): When in doubt, refuse the temptation
to guess, the test server will set its host in whatever way it see
fit, so use that.

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