Andrew's git / gitweb.git / t/t4018/css-trailing-space
?
t / t4018 / css-trailing-spaceon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1RIGHT label.control-label {
   2    margin:10px;   
   3    padding:10px;
   4    border : 10px ChangeMe #C6C6C6;
   5}