pub fn check_in_progress(dir: &Path) -> Result<Option<Report>, Box<dyn Error>>
Verify the resolution on disk in dir against the merge in progress (or HEAD’s merge commit). None: no three-way context to verify against.
dir
None