comparison hooks/post-up @ 31:faf7781dae42

Only show conflict markers when more than 3 <
author zegervdv <zegervdv@me.com>
date Tue, 01 Apr 2014 20:56:02 +0200
parents 36a9b3a28861
children db3720a03952
comparison
equal deleted inserted replaced
30:7dfc911400a3 31:faf7781dae42