On Thu, 2011-01-13 at 10:06 -0600, Vincent Ladeuil wrote: > With recent enough bzr versions, 'bzr resolve file --take-this' should > do the same thing (and mark the conflict as resolved too). Nice! This is essentially the "bzr keep" that I suggested elsewhere in this thread. Consider that suggestion retracted :-) - Eric