err, no. sorry, but, too-hard-to-read :( On Fri, Feb 5, 2016 at 2:19 PM, timeless <timeless at gmail.com> wrote: > Durham Goode <durham at fb.com> wrote: >> During a merge, each file has a current commitnode+filenode, an other > > > Probably "and"