Rev 3252: Small doc fix in conflict resolution. (Martin Albisetti) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3252
revision-id:pqm at pqm.ubuntu.com-20080306002706-0ahjg0eqnxh8ofas
parent: pqm at pqm.ubuntu.com-20080305131343-toq33x607hecihie
parent: jelmer at samba.org-20080305223658-a9ici3oxtwyy0v11
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-03-06 00:27:06 +0000
message:
  Small doc fix in conflict resolution. (Martin Albisetti)
modified:
  doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
    ------------------------------------------------------------
    revno: 3251.1.1
    revision-id:jelmer at samba.org-20080305223658-a9ici3oxtwyy0v11
    parent: pqm at pqm.ubuntu.com-20080305131343-toq33x607hecihie
    parent: argentina at gmail.com-20080305102617-ah2z6vbayk1liu0b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Wed 2008-03-05 23:36:58 +0100
    message:
      Merge documentation fix from Martin.
    modified:
      doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
    ------------------------------------------------------------
    revno: 3250.1.1
    revision-id:argentina at gmail.com-20080305102617-ah2z6vbayk1liu0b
    parent: pqm at pqm.ubuntu.com-20080304113936-4wrordr8lrxhvfdl
    committer: Martin Albisetti <argentina at gmail.com>
    branch nick: bzr.docfix
    timestamp: Wed 2008-03-05 10:26:17 +0000
    message:
      Small tweak to make resolving conflicts a bit clearer
    modified:
      doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
=== modified file 'doc/en/user-guide/resolving_conflicts.txt'
--- a/doc/en/user-guide/resolving_conflicts.txt	2007-12-04 12:56:31 +0000
+++ b/doc/en/user-guide/resolving_conflicts.txt	2008-03-05 10:26:17 +0000
@@ -35,8 +35,8 @@
 each file in question, fixing the relevant areas and removing the
 conflict markers as you go.
 
-After fixing all the files in conflict, ask Bazaar to mark them as
-resolved using the ``resolve`` command like this::
+After fixing all the files in conflict, and removing the markers, 
+ask Bazaar to mark them as resolved using the ``resolve`` command like this::
 
   bzr resolve