Bugfix: automatically recommit back after successful 3-way merge
Bugfix: automatically recommit back after successful 3-way merge

In most cases this is what the user wants anyway.

moio/tetra,moio/tetra,moio/tetra,moio/tetra,moio/tetra