On Thu, Apr 21, 2016 at 10:57:34AM +0100, Philip Martin wrote: > Stefan Sperling <s...@elego.de> writes: > > > Funny. It works with 1.9.x indeed. > > > > Now try the same with a trunk client. > > Is this a regression? Or a new feature? > > This is caused by the deliberate change, r1739263, to the way our merge > algorithm handles adjacent changes.
Thanks, that explains it. BTW, it looks like some of the Ruby tests were relying on this behaviour and are now failing: https://ci.apache.org/builders/bb-openbsd/builds/363/steps/Test%20bindings/logs/testlog-swig-rb
