Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
From: Dennis Kaarsemaker <dennis@xxxxxxxxxxxxxxx>
Date: Mon, 29 Aug 2016 11:51:33 +0200
Cc: Junio C Hamano <gitster@xxxxxxxxx>
In-reply-to: <1f79d41e3417a0b1f0cffccc40e97f1a2c5ef987.1472457609.git.johannes.schindelin@gmx.de>
References: <cover.1472457609.git.johannes.schindelin@gmx.de> <1f79d41e3417a0b1f0cffccc40e97f1a2c5ef987.1472457609.git.johannes.schindelin@gmx.de>

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/?

D.

Follow-Ups:
- Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
  - From: Johannes Schindelin

References:
- [PATCH 00/22] Prepare the sequencer for the upcoming rebase -i patches
  - From: Johannes Schindelin
- [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
  - From: Johannes Schindelin

Prev by Date: Re: improve 'git pull' status message
Next by Date: Re: [PATCH 00/22] Prepare the sequencer for the upcoming rebase -i patches
Previous by thread: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
Next by thread: Re: [PATCH 20/22] sequencer: remember do_recursive_merge()'s return value
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]