t / t4018 / css-brace-in-col-1on commit t6036: add a failed conflict detection case with submodule modify/modify (d4d1718)
   1RIGHT label.control-label
   2{
   3    margin-top: 10px!important;
   4    border : 10px ChangeMe #C6C6C6;
   5}