mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation 
1
2
3
4
5

public class MyClass {
    public void SpinThePedals(float howMuch);
    public void SlamTheBrakes(bool tooLate);
    public int SpinThePedals();
}