mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
{
<<<<<<< LEFT
    "new_letter": "left value",
||||||| BASE
=======
    "new_letter": "right value",
>>>>>>> RIGHT
    "alpha": "α",
    "beta": "β",
    "gamma": "γ",
    "delta": "δ"
}