notes: add notes.mergeStrategy option to select default strategy

[git] / t / t4018 / cpp-class-definition-derived

class RIGHT :
        public Baseclass
{
        int ChangeMe;
};