tests/test-merge3

fix 'hg tag <tagname> <revision>

- fix a collision with the option keyword rev and the option
  name
- update the tests

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"