t / t4018 / css-colon-selectoron commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1RIGHT a:hover {
   2    margin-top:
   3    10px!important;
   4    border : 10px ChangeMe #C6C6C6;
   5}