pub fn merge(
    base: &Path,
    local: &Path,
    remote: &Path,
    _merged: &Path
) -> Result<()>