[andreareina]

git does privilege the first parent[1] in a merge in a bunch of contexts

[1] i.e. the branch you did the merge from