From 555f03ac9b33d32e7b46ed7c71b39b1ee6d5b572 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 22 Feb 2026 14:09:02 +0100 Subject: fix doc text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- README | 2 +- git-rediff.1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index fe81103..c570b1d 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ OPERANDS EXIT STATUS The following exit values are returned: - 0 All merge conflicts where resolved. + 0 All merge conflicts were resolved. 1 There are still merge conflicts. diff --git a/git-rediff.1 b/git-rediff.1 index e369a00..db970c6 100644 --- a/git-rediff.1 +++ b/git-rediff.1 @@ -1,4 +1,4 @@ -.TH GIT-REDIFF 1 +.TH GIT-REDIFF 1 GIT-REDIFF .SH NAME git-rediff - Reduce partially resolved merge conflicts .SH SYNOPSIS @@ -25,7 +25,7 @@ the result is written to standard output. The following exit values are returned: .TP 0 -All merge conflicts where resolved. +All merge conflicts were resolved. .TP 1 There are still merge conflicts. -- cgit v1.2.3-70-g09d2