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