t / t4018 / css-trailing-spaceon commit t6036: add a failed conflict detection case with symlink modify/modify (c6d3dd5)
   1RIGHT label.control-label {
   2    margin:10px;   
   3    padding:10px;
   4    border : 10px ChangeMe #C6C6C6;
   5}