Andrew's git / gitweb.git / t/t4018/cpp-class-definition
?
t / t4018 / cpp-class-definitionon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};