Phoronix Test Suite
Git Commit: Advanced merging...

Advanced merging support...

http://www.phorogit.com/index.php?p=...dbb32bc60cfaaa