Improve documentation.
Add options --edit/--no-edit to "record" and "continue" subcommands.

When there are staged changes, allow the user to pass --edit/--no-edit
options to the "git commit" command that is used to commit them.
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 a --manual option, which causes the git-imerge to ask the user to
complete every micromerge manually, even when it doesn't appear to
conflict.  This is useful for merging changes that involve a lot of
logical conflicts that do not conflict textually.