change/delete conflicts and explicit merge tools
Siddharth Agarwal
sid at less-broken.com
Fri Nov 13 21:32:34 CST 2015
On 11/13/15 19:31, Pierre-Yves David wrote:
>>
>
> Default for interractive would be "leave unresolved", non-interractive
> pick the default.
Ah, gotcha.
More information about the Mercurial-devel
mailing list