branch test
AND simple
& simple
conflict fixed
retest the branch
branch test
AND simple
& simple
conflict fixed
Add test for test no-ff mode.
merge with no-ff
Merge with ff mode.