diff options
| author | Wilfred Hughes <me@wilfred.me.uk> | 2023-12-29 19:39:44 -0800 |
|---|---|---|
| committer | Wilfred Hughes <me@wilfred.me.uk> | 2023-12-29 19:39:44 -0800 |
| commit | 8b90c95e01f5d537d04c8d1ec02e394e25acd5a2 (patch) | |
| tree | b122d7e36e59ba431d080640079268466a669866 /src/options.rs | |
| parent | c180fb52a9a8df98145373cdc1b155c0e4ce11ec (diff) | |
When called with a single path, require conflict markers
Fixes #585
Diffstat (limited to 'src/options.rs')
| -rw-r--r-- | src/options.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/options.rs b/src/options.rs index d4b7be015b..09a530a435 100644 --- a/src/options.rs +++ b/src/options.rs @@ -23,7 +23,7 @@ pub(crate) const DEFAULT_PARSE_ERROR_LIMIT: usize = 0; pub(crate) const DEFAULT_TAB_WIDTH: usize = 8; -const USAGE: &str = concat!(env!("CARGO_BIN_NAME"), " [OPTIONS] OLD-PATH NEW-PATH"); +pub(crate) const USAGE: &str = concat!(env!("CARGO_BIN_NAME"), " [OPTIONS] OLD-PATH NEW-PATH"); #[derive(Debug, Clone, Copy)] pub(crate) enum ColorOutput { |