Merge "Make the --other-branches configurable"