Allow fancy positional arguments with the reset command.

This behaves similar to the revert command, except the
revision id is mandatory here.
Added experimental "merge" command.

This only supports fast-forward merging for now.