From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Aug 2016 18:41:33 GMT
Subject: Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors
Message-ID: <xmqqlh0gjpr6.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <8ff71aba37be979f05abf88f467ec932aa522bdd.1470051326.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

> Subject: Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

s/merge_/merge-/; for this one alone.

> There are a couple of places where return values never indicated errors
> before, as wie simply died instead of returning.

s/wie/we/;