On Tue, Dec 6, 2011 at 8:37 PM, Isaac Jurado <diptongo at gmail.com> wrote: > And now, imagining that bfile does not exist, tell me how would you > recover afile to have the same contents as bfile. $ hg resolve afile --tool internal:local or $ hg resolve afile to redo the merge?