Fri, 18 Apr 2008 00:04:24 +0300 Oleksander Gavenko Added highlight for conflict.
Fri, 18 Apr 2008 00:04:23 +0300 Oleksander Gavenko Added face define for conflict.
Fri, 18 Apr 2008 00:03:41 +0300 Oleksander Gavenko Correct emacs vars.
(0) -10 -3 +3 +10 +30 +100 +300 +1000 tip