[PATCH 5 of 7 mergedriver] merge.applyupdates: use counters from mergestate
Siddharth Agarwal
sid at less-broken.com
Sun Nov 22 23:43:22 CST 2015
On 11/22/15 21:32, Martin von Zweigbergk wrote:
> Can 'preresolve' now stop returning the 'r' value now? I saw that it's
> also used in commands.py:5677, but maybe there's now a better way to
> do that just there was here?
I don't think so -- higher level functions still need to know if there
was a failure during (pre)resolution.
More information about the Mercurial-devel
mailing list