2 files changed, 3 insertions, 11 deletions
diff --git a/src/repo/git/checkout.rs b/src/repo/git/checkout.rs
index 44879a6..87c63c1 100644
--- a/src/repo/git/checkout.rs
+++ b/src/repo/git/checkout.rs
@@ -21,7 +21,7 @@ impl Repo {
     ) -> Result<(), RepoError> {
         let repo = self.repo()?;
 
-        let workdir = repo.work_dir().ok_or(RepoError::NoWorktree)?;
+        let workdir = repo.workdir().ok_or(RepoError::NoWorktree)?;
         let head_tree = head
             .object()
             .context("could not find object HEAD points to")?
diff --git a/src/repo/git/ffmerge.rs b/src/repo/git/ffmerge.rs
index 382718b..7f30a4b 100644
--- a/src/repo/git/ffmerge.rs
+++ b/src/repo/git/ffmerge.rs
@@ -1,17 +1,9 @@
 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;
+use gix::Id;
 
 impl Repo {
-    pub fn ffmerge(&self, a: Id, b: Id) -> Result<(), RepoError> {
-
+    pub fn ffmerge(&self, _a: Id, _b: Id) -> Result<(), RepoError> {
         Ok(())
     }
 }