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

Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git