fixup! Implement sync subcommand in clippy_dev

Author: flip1995

clippy_dev/src/sync.rs

@@ -6,7 +6,11 @@ use std::process::exit;
 
 use xshell::{Shell, cmd};
 
-const JOSH_FILTER: &str = ":rev(53d3bc02ed90eba01c5dbc5b2d0c4cabb67ffb4d:prefix=src/tools/clippy):/src/tools/clippy";
+// const JOSH_FILTER: &str =
+// ":rev(d9fb15c4b1ebe9e7dc419e07f53af681d7860cbe:prefix=src/tools/clippy):/src/tools/clippy:
+// from(b19acfca58b1f2cc7b4fe1adadd3a8b5c97b840d:prune=trivial-merge)";
+const JOSH_FILTER: &str =
+    ":rev(d9fb15c4b1ebe9e7dc419e07f53af681d7860cbe:prefix=src/tools/clippy):/src/tools/clippy:prune=trivial-merge";
 const JOSH_PORT: &str = "42042";
 const TOOLCHAIN_TOML: &str = "rust-toolchain.toml";
 const UTILS_README: &str = "clippy_utils/README.md";