src/repo/git/ffmerge.rs


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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(())
    }
}