xbmc/xbmc — comment on commit 68fff18a68c90ddf70fe90723135bb7a43add20c
File:  line 0
By elupus:

The biggest problem is that the merge is done in the wrong order :(. That is why the diff above is so messed up. The merge is master has been merged into his branch, then pushed to replace master.

This means the order of the parents are wrong, causing to think we re-added the commits already in master. I've said it before, we MUST get a way to block these types of merges.