Make ci-test --merge the default mode

And have the "branch" mode be selected with --branch or --no-merge (perhaps less good).

/cc @chasse