aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2024-08-15 20:41:10 +0200
committerMattias Andrée <maandree@kth.se>2024-08-15 20:41:10 +0200
commitf22e8d755404a6a4a9934b6d8327e44c59c01cdd (patch)
treed21f99848084561014b6367f23ada68eb8e4534a
parentAdd README and git-rediff.1 (diff)
downloadgit-rediff-f22e8d755404a6a4a9934b6d8327e44c59c01cdd.tar.gz
git-rediff-f22e8d755404a6a4a9934b6d8327e44c59c01cdd.tar.bz2
git-rediff-f22e8d755404a6a4a9934b6d8327e44c59c01cdd.tar.xz
Fix typo
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-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>...]