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