[PATCH 3 of 3] merge: add file ancestor linknode to mergestate

timeless timeless at gmail.com
Fri Feb 5 14:19:26 EST 2016


Durham Goode <durham at fb.com> wrote:
> During a merge, each file has a current commitnode+filenode, an other


Probably "and"


More information about the Mercurial-devel mailing list