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

[Siddharth Agarwal]

On 11/28/15 17:58, Siddharth Agarwal wrote:
> 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.

Actually, at this point since the file is deleted ('deleted' is true) 
the file isn't on disk anyway, so the point is moot. However we won't 
take any further action.