Conflict while using "bzr pull"

[Aaron Bentley]

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

James Blackwell wrote:
> On Mon, Dec 12, 2005 at 09:53:28AM -0500, Aaron Bentley wrote:
>>Perhaps "bzr revert --pristine" would delete all unversioned files as
>>well as restoring source files to the correct names and contents.

> -1 to pristine. Though archers know it, it not in the common venacular.

If there's common vernacular, we should use it.  Otherwise, I think
"pristine" is an accurate term, and a reasonably well-known word.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDnv660F+nu1YWqI0RAvhKAJwIlavFBUrfI/V3lzfw3ugaf1c2XwCeLwGs
Mmm0GeQPuGMleyv3ib8ThKk=
=jJOr
-----END PGP SIGNATURE-----