Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed some typos #1553

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Fixed some typos #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/examples/189-merge-conflict.4.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion etc/examples/189-merge-conflict.5.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion manual/src/full---help-output.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>,

Expand Down
Loading