aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--git-rediff.12
2 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 818b3fc..fe81103 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
NAME
- git-rediff - Reduce partially resovled merge conflicts
+ git-rediff - Reduce partially resolved merge conflicts
SYNOPSIS
git rediff [<path>...]
diff --git a/git-rediff.1 b/git-rediff.1
index 5374e85..e369a00 100644
--- a/git-rediff.1
+++ b/git-rediff.1
@@ -1,6 +1,6 @@
.TH GIT-REDIFF 1
.SH NAME
-git-rediff - Reduce partially resovled merge conflicts
+git-rediff - Reduce partially resolved merge conflicts
.SH SYNOPSIS
.I git rediff
[<path>...]