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