Re: git, $FreeBSD$ and mergemaster

2020-12-25 Thread Jonathan Chen
Hi Kyle, On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen wrote: > > > > Hi, > > > > With the transition to git, I'm now getting a lot of prompts for > > differences against an empty $FreeBSD$, eg: > > > > *** Displaying differences between inst

Re: git, $FreeBSD$ and mergemaster

2020-12-25 Thread David Wolfskill
On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: > Hi Kyle, > > On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > ... > > mergemaster only uses it as an optimization, if they're unexpanded > > throughout then it falls back to diff(1) -- i.e. it's slower without. > > Thanks for the