It's been around for some time now. I think 1.7 added it.

I don't know if it was buggy or if we were doing something wrong, but it still caused merging disasters even though in theory it should have been able to avoid them.