mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
struct my_struct {
    int field_1;
};