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

class MyClass {
        doSomething() {
                console.log('hi');
        }

        doSomethingElse() {
                console.log('bye');
        }

        warnEveryone() {
                alert('oh no!');
        }
}