Andrew's git / gitweb.git / t/t4018/cpp-c++-function
?
t / t4018 / cpp-c++-functionon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1Item RIGHT::DoSomething( Args with_spaces )
   2{
   3        ChangeMe;
   4}