Extract a method MergeState.check_name_format().
Change signature of MergeState.initialize().

Make "goal" into a keyword parameter.
Change signature of MergeState.__init__().

Make "goal" into a keyword parameter.
Add a --manual option to "start" and "init" subcommands.

The --manual option causes git-imerge to ask the user to complete
every micromerge manually, even if git thinks that it is
conflict-free.
Merge branch 'manual-merges'

Add option --manual to "start" and "init" subcommands to request that
all merges be done manually by the user.
Remove some commented-out code.

There is no need schlepping this deadweight around.