[MERGE] Small doc fix in conflict resolution
Aaron Bentley
aaron at aaronbentley.com
Wed Mar 5 13:31:51 GMT 2008
-----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-----
More information about the bazaar
mailing list