mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
6
json func() {
  return json{{"num", 0},
              {"obj", {{"a", 1}, {"b", 2}}},
              {"list", json::array({{{"a", 3}, {"b", 4}}})},
              {"c", 5}};
}