merge_tools: create internal difftool

jj-vcs · Aug 23, 2023 · a375859 · a375859
1 parent 7226334
commit a375859
Show file tree

Hide file tree

Showing 5 changed files with 682 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,6 +64,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