fixed typos (#1553)

dandavison · Nov 18, 2023 · dc692ea · dc692ea
1 parent 7375f7a
commit dc692ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>,