1 files changed, 17 insertions, 0 deletions
diff --git a/src/repo/git/ffmerge.rs b/src/repo/git/ffmerge.rs
new file mode 100644
index 0000000..382718b
--- /dev/null
+++ b/src/repo/git/ffmerge.rs
@@ -0,0 +1,17 @@
+use super::{Repo, RepoError};
+
+use anyhow::Context;
+use gix::{
+    clone::checkout::main_worktree::ProgressId, interrupt::IS_INTERRUPTED, progress, remote, Id,
+    Progress,
+};
+
+use gix_index::{File, State};
+use tracing::debug;
+
+impl Repo {
+    pub fn ffmerge(&self, a: Id, b: Id) -> Result<(), RepoError> {
+
+        Ok(())
+    }
+}