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