Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.