t / t4018 / cpp-class-definitionon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};