mergiraf 0.19.1

A syntax-aware merge driver for Git
Documentation 
1
2
3
4
5
6
7
8
9
10
11

public class MyClass {
    public void SpinThePedals(float howMuch);
    public void SlamTheBrakes(bool tooLate);
<<<<<<< LEFT
    public int SpinThePedals();
||||||| BASE
=======
    public void SpinThePedals();
>>>>>>> RIGHT
    public void SpinThePedals(bool forever);
}