WIP: `Fix merge --no-ff` - #98

Open

IanLee1521 wants to merge 2 commits into

git-school:gh-pagesfrom

IanLee1521:gh-83-merge-no-ff

Commits on Jul 9, 2017

WIP: #83 add support for --no-ff with few commits
IanLee1521
committed
bd8c288
Fixes the new case, but breaks the normal --no-ff functionality
IanLee1521
committed
8790c69