t / t4018 / css-brace-in-col-1on commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1RIGHT label.control-label
   2{
   3    margin-top: 10px!important;
   4    border : 10px ChangeMe #C6C6C6;
   5}