tests/test-merge3.out

Uniformisation of commit help for -m and -l.
 Addition of the -m and -l options for hg import.
 'hg tag' still lacks the --logfile option which short form conflicts with
 its --local option.

removing b
nothing changed