On Thu, 2011-01-13 at 04:00 -0500, Glenn Morris wrote: > Contents conflict in path/to/file > bzr revert path/to/file > bzr: ERROR: Path(s) are not versioned: path/to/file Try "bzr revert path/to/file.OTHER". Strange but true... - Eric