mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation 
1
2
3
4
5
6
7
8
9

{
    "a": 1,
    "d": 8,
    "e": 9,
    "f": 7,
    "g": 6,
    "z": -1,
    "b": 2
}