git merge --no-ff doesn't work if it's one commit away from the original branch

[hollenberry]

👋 @kuychaco + @BinaryMuse !

Example:
This is broken

But this works

[hollenberry]

Oops! Bad citizen, this already exists here: #83

Closing out.