notes: add notes.mergeStrategy option to select default strategy
[git] / t / t4018 / cpp-class-definition
1 class RIGHT
2 {
3         int ChangeMe;
4 };