mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
struct my_struct {
    int field_1;
    char field_2;
    size_t field_3;
};