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

Johannes Schindelin [off-list ref] 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/;