aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 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.