/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: Martin Pool
  • Date: 2008-02-07 03:49:57 UTC
  • mto: This revision was merged to the branch mainline in revision 3219.
  • Revision ID: mbp@sourcefrog.net-20080207034957-cc7tlku5xfya9wei
Update test_push_log_file to handle there always being timestamps at the start of the trace 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,
39
 
ask Bazaar to mark them as resolved using the ``resolve`` command like this::
 
38
After fixing all the files in conflict, ask Bazaar to mark them as
 
39
resolved using the ``resolve`` command like this::
40
40
 
41
41
  bzr resolve
42
42