t / t4034 / css / expecton commit Merge branch 'jk/difftool-in-subdir' (5a5d3f1)
   1<BOLD>diff --git a/pre b/post<RESET>
   2<BOLD>index b8ae0bb..fe500b7 100644<RESET>
   3<BOLD>--- a/pre<RESET>
   4<BOLD>+++ b/post<RESET>
   5<CYAN>@@ -1,10 +1,10 @@<RESET>
   6.<RED>class-form<RESET><GREEN>other-form<RESET> label.control-label {
   7    margin-top: <RED>10<RESET><GREEN>15<RESET>px!important;
   8    border : 10px <RED>dashed<RESET><GREEN>dotted<RESET> #C6C6C6;
   9}<RESET>
  10<RED>#CCCCCC<RESET><GREEN>#CCCCCB<RESET>
  1110em<RESET>
  12<RED>padding-bottom<RESET><GREEN>margin-left<RESET>
  13150<RED>px<RESET><GREEN>em<RESET>
  1410px
  15<RED>!important<RESET>
  16<RED>div<RESET><GREEN>li<RESET>.class#id