Hi,
We've enabled JGit's recursive merger for all repositories using content merge strategies (basically any not using fast forwarding, which is most). The intention is to lower the number of trivial conflicts that people are having to resolve locally.
This is considered experimental by Gerrit, but is now the default for JGit itself, so I believe it's stable enough for us to use. That being said, it's still new-ish so there's always a chance we'll hit some bug. So, if you see anything, ANYTHING related to merge problems then I'd like to know about it so we can either get it fixed or turn the feature back off (if it's patently broken).
Thanks!
-Chad