mergiraf 0.19.1

A syntax-aware merge driver for Git
Documentation
1
2
3
4
public class MyClass {
    public void SpinThePedals();
    public void SpinThePedals(bool forever);
}