I think -s and -a should be mutually exclusive (i.e. error if both are set).
I don't think diamond should have any bzr-specific code.
« Back to merge proposal
I think -s and -a should be mutually exclusive (i.e. error if both are set).
I don't think diamond should have any bzr-specific code.