On 2015-05-10 04:27, Phil Race wrote:
I guess this was my merge .. I know it was 2 months ago but I do not remember being asked to merge this manually so it looks like an odd auto-merge anomaly as it seemed to get all the other 6 or so cases right.
Merges of code you haven't written yourself can be bitches sometimes. :-/ When I'm really paranoid I never trust the automerge but manually re-checks all files. But that really only works if you know exactly what you're looking at (and for).
/Magnus
