mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

#include<stdio.h>

class MyClass {
    void run(int argc) {
        printf("too few arguments\n");
        exit(1);
    }
<<<<<<< LEFT
    // central backbone of the algorithm
    void run() {
        printf("hello\n");
    }
||||||| BASE
=======
    void run(bool reallyFast) {
        printf("world\n");
    }
>>>>>>> RIGHT
}