Andrew's git / gitweb.git / t/t4018/php-trait
?
t / t4018 / php-traiton commit rebase -r: demonstrate bug with conflicting merges (f08110d)
   1trait RIGHT
   2{
   3    public function foo($ChangeMe)
   4    {
   5        return 'foo';
   6    }
   7}