diff options
| author | Mattias Andrée <m@maandree.se> | 2026-02-22 14:09:02 +0100 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-02-22 14:09:02 +0100 |
| commit | 555f03ac9b33d32e7b46ed7c71b39b1ee6d5b572 (patch) | |
| tree | 605f2a45fc8c38b0875a566862e538d628bdb4a9 | |
| parent | Fix support for CRLF line endings (which git may actually produce on conflict marker lines) (diff) | |
| download | git-rediff-555f03ac9b33d32e7b46ed7c71b39b1ee6d5b572.tar.gz git-rediff-555f03ac9b33d32e7b46ed7c71b39b1ee6d5b572.tar.bz2 git-rediff-555f03ac9b33d32e7b46ed7c71b39b1ee6d5b572.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | git-rediff.1 | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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. |