Add --reset(-to-remote) options to "merge"
Implement merge --reset(-to-remote)
Add functional_tests/merge.t
Add doc/source/scenarios/merge.rst