Fri, 22 Aug 2008 08:26:18 +0200 Christian Ebert Avoid additional conflicts during merge/resolve
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip