Hi Dennis, On Mon, 29 Aug 2016, Dennis Kaarsemaker wrote:
> On ma, 2016-08-29 at 10:06 +0200, Johannes Schindelin wrote: > > > The return value of do_recursive_merge() may be positive (indicating merge > > conflicts), se let's OR later error conditions so as not to overwrite them > > with 0. > > s/se/so/? Good eyes. Fixed, Dscho
