merge_tools: create builtin diff editor

jj-vcs · Aug 30, 2023 · 5dd2cfa · 5dd2cfa
1 parent ccd67e8
commit 5dd2cfa
Show file tree

Hide file tree

Showing 6 changed files with 659 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,6 +65,7 @@ smallvec = { version = "1.11.0", features = [
     "const_new",
     "union",
 ] }
+scm-record = "0.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.105"
 slab = "0.4.9"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -49,6 +49,7 @@ pest = { workspace = true }
 pest_derive = { workspace = true }
 regex = { workspace = true }
 rpassword = { workspace = true }
+scm-record = { workspace = true }
 serde = { workspace = true }
 slab = { workspace = true }
 tempfile = { workspace = true }