Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings

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

Subject: Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings
From: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
Date: Tue, 21 Dec 2021 22:19:48 +0100
Cc: git@xxxxxxxxxxxxxxx, Jeff King <peff@xxxxxxxx>, Jonathan Nieder <jrnieder@xxxxxxxxx>, Sergey Organov <sorganov@xxxxxxxxx>, Bagas Sanjaya <bagasdotme@xxxxxxxxx>, Neeraj Singh <nksingh85@xxxxxxxxx>, Elijah Newren <newren@xxxxxxxxx>
In-reply-to: <d022176618d76943743940da0787291d51c9b4f0.1640109948.git.gitgitgadget@gmail.com>
References: <pull.1103.git.1640109948.gitgitgadget@gmail.com> <d022176618d76943743940da0787291d51c9b4f0.1640109948.git.gitgitgadget@gmail.com>
User-agent: Debian GNU/Linux bookworm/sid; Emacs 27.1; mu4e 1.6.10

On Tue, Dec 21 2021, Elijah Newren via GitGitGadget wrote:

> From: Elijah Newren <newren@xxxxxxxxx>

> +	if (status == LL_MERGE_BINARY_CONFLICT)
> +		warning("Cannot merge binary files: %s (%s vs. %s)",
> +			"base", "ours", "theirs");

This & other messages in the series have warning/BUG etc. starting with
upper-case.

Follow-Ups:
- Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings
  - From: Elijah Newren

References:
- [PATCH 0/9] Add a new --remerge-diff capability to show & log
  - From: Elijah Newren via GitGitGadget
- [PATCH 2/9] ll-merge: make callers responsible for showing warnings
  - From: Elijah Newren via GitGitGadget

Prev by Date: Re: [PATCH v2] l10n: README: call more attention to plural strings
Next by Date: Re: [PATCH 8/9] show, log: provide a --remerge-diff capability
Previous by thread: [PATCH 2/9] ll-merge: make callers responsible for showing warnings
Next by thread: Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings
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]