Merge "Merger: log non Git exceptions on merge"