Sun, 22 Feb 2015 23:32:48 +0200 merge.conflictstyle diff3
Oleksandr Gavenko <gavenkoa@gmail.com> [Sun, 22 Feb 2015 23:32:48 +0200] rev 731
merge.conflictstyle diff3
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip