[PATCH 2 of 6 mergedriver] mergestate: explicitly forget 'dc' conflicts where the deleted side is picked

Siddharth Agarwal sid at less-broken.com
Sat Nov 28 19:58:36 CST 2015


On 11/27/15 22:14, Martin von Zweigbergk wrote:
> Does 'f' stand for 'forget'? Will the file also be removed if it 
> exists, or will it just become untracked (eventually, when this 
> feature is done))?

Yeah, 'f' stands for forget (or 'drop', as the internal APIs call it). 
The file will just become untracked -- it will not be removed from disk.


More information about the Mercurial-devel mailing list