Use git merge to properly diff merge scenarios with multiple bases

[rafaelmotaalves]

We probably can use git merge infrastructure with some kind of stub to do this.