t / t4018 / css-trailing-spaceon commit merge-recursive: add computation of collisions due to dir rename & merging (ea625cb)
   1RIGHT label.control-label {
   2    margin:10px;   
   3    padding:10px;
   4    border : 10px ChangeMe #C6C6C6;
   5}