[@matveb Member 16 years, 3 months ago]

I was able to merge fine on trunk revision 2388 and on 1.0.2 so it should be the plugin.