Remove duplicate --p4-* options from 'rbt diff'.

We fixed a bug with missing options twice on different branches, which meant
when we merged, we ended up with these defined twice. Trivial fix.