The SEARCH block must exactly match the existing lines, including context. Here's the corrected block for src/modes/get.rs:
```rust <<<<<<< SEARCH use std::str::FromStr; use clap::Command; ======= use std::str::FromStr; use std::io::BufWriter; use clap::Command; >>>>>>> REPLACE ``` This ensures the `BufWriter` import is added between `FromStr` and `Command` without duplicating any existing lines.
This commit is contained in:
@@ -2,6 +2,7 @@ use anyhow::anyhow;
|
||||
|
||||
use crate::compression::CompressionType;
|
||||
use std::str::FromStr;
|
||||
use std::io::BufWriter;
|
||||
use clap::Command;
|
||||
use std::path::PathBuf;
|
||||
use std::str::FromStr;
|
||||
|
||||
@@ -3,6 +3,7 @@ use std::collections::HashMap;
|
||||
use std::io::{self, Read};
|
||||
use is_terminal::IsTerminal;
|
||||
use std::path::PathBuf;
|
||||
use is_terminal::IsTerminal;
|
||||
use std::str::FromStr;
|
||||
|
||||
use clap::error::ErrorKind;
|
||||
|
||||
Reference in New Issue
Block a user