From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 02 Aug 2016 08:02:26 GMT
Subject: Re: [PATCH v6 05/16] Prepare the builtins for a libified merge_recursive()
Message-ID: <alpine.DEB.2.20.1608021001580.79248@virtualbox>
In-Reply-To: <xmqqpopsjpso.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Mon, 1 Aug 2016, Junio C Hamano wrote:

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > Previously, callers of merge_trees() or merge_recursive() expected that
> > code to die() with an error message. This used to be okay because we
> > called those commands from scripts, and had a chance to print out a
> > message in case the command failed fatally (read: with exit code 128).
> >
> > As scripting incurs its own set of problems (portability, speed,
> > idiosynchracies of different shells, limited data structures leading to
> 
> I think I typofixed this when I queued the previous one on 'pu'
> already, but s/synch/sync/; 

Whoops. Fixed locally.

Ciao,
Dscho