Comment 1 for bug 491711

The linked branch adds a hook that is intended to address this. It doesn't address "there may need to be some sort of ordering, e.g. interactive merges may want to always be last, after automated ones", but maybe that's not necessary initially, although it does sound like a good improvement to do at some stage.