Skip to main content

check_resolution

Function check_resolution 

Source
pub fn check_resolution(
    dir: &Path,
    opts: &Options,
    host: &Host,
    out: &mut dyn Write,
) -> Result<bool, Box<dyn Error>>
Expand description

The merge in progress in dir: the person’s in-place resolution, judged with the working-tree gate and the both-sides invariant and committed when it passes — or land’s own unfinished merge, aborted (never judged as a resolution). true: go on (committed, or aborted cleanly).