From dc692ea7968ea8f055b894c5a5c480165d71c3b3 Mon Sep 17 00:00:00 2001
From: Fritz Rehde <fritzrehde.work@gmail.com>
Date: Sat, 18 Nov 2023 16:11:11 +0100
Subject: fixed typos (#1553)

---
 etc/examples/189-merge-conflict.4.diff | 2 +-
 etc/examples/189-merge-conflict.5.diff | 2 +-
 manual/src/full---help-output.md       | 2 +-
 src/cli.rs                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/examples/189-merge-conflict.4.diff b/etc/examples/189-merge-conflict.4.diff
index d88ea2e2..7a13a9d3 100644
--- a/etc/examples/189-merge-conflict.4.diff
+++ b/etc/examples/189-merge-conflict.4.diff
@@ -4,7 +4,7 @@ index 888eee8b,7ea2e9d3..00000000
 +++ b/src/handlers/merge_conflict.rs
 @@@ -5,7 -5,7 +5,11 @@@ use crate::utils::process
   impl<'a> StateMachine<'a> {
-      pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> {
+      pub fn handle_merge_conflict_line(&mut self) -> std::io::Result<bool> {
           self.painter.emit()?;
 ++<<<<<<< HEAD
  +        // hello
diff --git a/etc/examples/189-merge-conflict.5.diff b/etc/examples/189-merge-conflict.5.diff
index 8e9ddab9..d22571c1 100644
--- a/etc/examples/189-merge-conflict.5.diff
+++ b/etc/examples/189-merge-conflict.5.diff
@@ -4,7 +4,7 @@ index 888eee8b,7ea2e9d3..00000000
 +++ b/src/handlers/merge_conflict.rs
 @@@ -5,7 -5,7 +5,12 @@@ use crate::utils::process
   impl<'a> StateMachine<'a> {
-      pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> {
+      pub fn handle_merge_conflict_line(&mut self) -> std::io::Result<bool> {
           self.painter.emit()?;
 ++<<<<<<< HEAD
  +        // hello
diff --git a/manual/src/full---help-output.md b/manual/src/full---help-output.md
index 5d8dabcb..58323ef1 100644
--- a/manual/src/full---help-output.md
+++ b/manual/src/full---help-output.md
@@ -180,7 +180,7 @@ Options:
       --grep-header-decoration-style <STYLE>
           Style string for the header decoration in grep output.
 
-          Default is "none" when grep-ouput-type-is "ripgrep", otherwise defaults to value of header-decoration-style. See hunk-header-decoration-style.
+          Default is "none" when grep-output-type-is "ripgrep", otherwise defaults to value of header-decoration-style. See hunk-header-decoration-style.
 
       --grep-header-file-style <STYLE>
           Style string for the file path part of the header in grep output.
diff --git a/src/cli.rs b/src/cli.rs
index 817ab056..ca967f58 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -409,7 +409,7 @@ pub struct Opt {
     #[arg(long = "grep-header-decoration-style", value_name = "STYLE")]
     /// Style string for the header decoration in grep output.
     ///
-    /// Default is "none" when grep-ouput-type-is "ripgrep", otherwise defaults
+    /// Default is "none" when grep-output-type-is "ripgrep", otherwise defaults
     /// to value of header-decoration-style. See hunk-header-decoration-style.
     pub grep_header_decoration_style: Option<String>,
 
-- 
cgit v1.2.3