Thanks for your reply! I've tried to address your comments point by point below:
> Nit: I'm not sure what this "merge driver" and "merge tool" mean, and the
> term "merge driver" seems to have a different meaning in Mercurial. Can you
> elaborate?
I wasn't certain of the mercurial terminology,
On Fri, 1 Dec 2017 11:25:01 +0100, Vidar Tonaas Fauske wrote:
> > Nit: I'm not sure what this "merge driver" and "merge tool" mean, and the
> > term "merge driver" seems to have a different meaning in Mercurial. Can you
> > elaborate?
>
> I wasn't certain of the mercurial terminology, so I just
On Sun, Nov 26, 2017 at 08:33:58PM +0900, Yuya Nishihara wrote:
> On Sat, 25 Nov 2017 13:34:58 +0100, Vidar Tonaas Fauske wrote:
> > exporting patch:
> > # HG changeset patch
> > # User Vidar Tonaas Fauske
> > # Date 1510750467 -3600
> > # Wed Nov 15 13:54:27 2017 +0100
> > # Node ID
On Sat, Nov 25, 2017 at 01:34:58PM +0100, Vidar Tonaas Fauske wrote:
> exporting patch:
> # HG changeset patch
> # User Vidar Tonaas Fauske
> # Date 1510750467 -3600
> # Wed Nov 15 13:54:27 2017 +0100
> # Node ID 7072463ab05996c7ae12ea4a6ccb9da305c54a53
> # Parent
On Sat, 25 Nov 2017 13:34:58 +0100, Vidar Tonaas Fauske wrote:
> exporting patch:
> # HG changeset patch
> # User Vidar Tonaas Fauske
> # Date 1510750467 -3600
> # Wed Nov 15 13:54:27 2017 +0100
> # Node ID 7072463ab05996c7ae12ea4a6ccb9da305c54a53
> # Parent
exporting patch:
# HG changeset patch
# User Vidar Tonaas Fauske
# Date 1510750467 -3600
# Wed Nov 15 13:54:27 2017 +0100
# Node ID 7072463ab05996c7ae12ea4a6ccb9da305c54a53
# Parent 75013952d8d9608f73cd45f68405fbd6ec112bf2
mergetools: add nbdime merge tools to default rc
Adds default
