diff options
Diffstat (limited to 'README')
| -rw-r--r-- | README | 2 |
1 files changed, 1 insertions, 1 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. |
