Andrew's git / gitweb.git / t/t4018/cpp-gnu-style-function
?
t / t4018 / cpp-gnu-style-functionon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1const char *
   2RIGHT(int arg)
   3{
   4        ChangeMe;
   5}