t / t4018 / cpp-class-definitionon commit mergetool: honor diff.orderFile (57937f7)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};