diff: allow to use -rA:B syntax as well as -rA -rB
(the addremove command is deprecated; use add and remove --after instead)adding dir/baradding foodir/barfoo(the addremove command is deprecated; use add and remove --after instead)adding dir/bar_2adding foo_2dir/bar_2foo_2