mergers 0.8.2

A visual diff and merge tool for files and directories
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52

use std::path::PathBuf;

pub mod myers;
pub mod patch;
pub mod settings;
pub mod ui;
pub mod vcs;

/// Re-exports for benchmarks. Not part of the public API.
#[doc(hidden)]
pub mod _bench {
    pub use crate::ui::{
        common::{
            editor::conflict_flags,
            gutter::{merged_gutter_chunks, middle_conflict_regions},
        },
        diff_state::{Side, compute_chunk_map_rects, find_next_chunk, format_chunk_label},
        merge_state::{
            conflict_at_cursor, conflict_at_cursor_fast, find_conflict_blocks,
            find_conflict_markers_in_text, merge_change_indices,
        },
    };
}

#[derive(Clone, Debug)]
pub enum CompareMode {
    Files {
        left: PathBuf,
        right: PathBuf,
        labels: Vec<String>,
    },
    Dirs {
        left: PathBuf,
        right: PathBuf,
        labels: Vec<String>,
    },
    Merge {
        left: PathBuf,
        middle: PathBuf,
        right: PathBuf,
        labels: Vec<String>,
    },
    Patch {
        base: PathBuf,
        patch: PathBuf,
        labels: Vec<String>,
    },
    Vcs {
        dir: PathBuf,
    },
    Welcome,
}