Add a new goal, "manual".

Add a new "manual" goal that is like "merge" but also keeps a
permanent record of any manual commits that were needed to resolve
conflicts, plus some automatic commits needed to make sense of the
manual commits.