tests/test-merge5.out

bash_completion: small cleanup and bugfix

_hg_count_non_option wasn't taking global options into account
while counting non-option arguments.

It also used only its first argument.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)