properly handle hashes and numbered args in branch.diff arg parser

properly handle hashes and numbered args in branch.diff arg parser #13003