[MERGE] Small doc fix in conflict resolution

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Albisetti wrote:
> Tweaked the conflict resolution explanation slightly to clarify the
> full steps needed to mark a conflict as resolved.

bb:approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHzqDH0F+nu1YWqI0RArR8AJ9FGcQ0NJuSIRZ/Is38XE2zbGgqcACcDP5W
/P8f8KyrXvkQgO9npUG/Kl0=
=+0Gw
-----END PGP SIGNATURE-----