Add a -revert option to utils/release/merge.sh