Andrew's git / gitweb.git / t/t4018/css-brace-in-col-1
?
t / t4018 / css-brace-in-col-1on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1RIGHT label.control-label
   2{
   3    margin-top: 10px!important;
   4    border : 10px ChangeMe #C6C6C6;
   5}