Thread (98 messages) 98 messages, 6 authors, 2022-02-02

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

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-12-21 21:21:28

On Tue, Dec 21 2021, Elijah Newren via GitGitGadget wrote:
From: Elijah Newren <redacted>
quoted hunk ↗ jump to hunk
+	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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help