# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1369835717 -10800
# Node ID 375c733219fb5022f44f8ca682850332f227dccd
# Parent  1248821d9d0bbe9025aa07296de55dd36166eab4
In Emacs 23.1: smerge-refine highlights word-level details of changes in
conflict.

diff -r 1248821d9d0b -r 375c733219fb .emacs-my
--- a/.emacs-my	Thu May 23 19:07:32 2013 +0300
+++ b/.emacs-my	Wed May 29 16:55:17 2013 +0300
@@ -1379,7 +1379,6 @@
    `(
      ("\t+" 0 'my-tab-face t)
      ( ,(concat "\\<\\(" (regexp-opt '("TODO" "FIX" "FIXME" "HACK" "XXX")) ":?\\)\\>") 1 'font-lock-warning-face t)
-     ("\\(=\\|<\\|>\\)\\{7,\\}" 0 'my-contrasty-face t)
      ;; 64 times, for highlight C-u C-u C-u <key>
      ("\\([^[:space:]]\\)\\1\\{63\\}" 0 'my-contrasty-face t)
      ))