On 19/12/2008 10:07, Peter Arrenbrecht wrote: > But no change to the default behaviour, meaning `hg resolve the/file` > will clobber any manual resolving I've already done when I meant to > say `hg resolve -m the/file`? The idea is that hg resolve without -a will be equivalent to -l. Cheers, Dirkjan