diff options
| -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. |