fix #8865: skip mixins and extends if child is already merged#8870

Merged

yyx990803 merged 3 commits intovuejs:devfrom KaelWD:fix/8865-extend-mixin-merge

Nov 30, 2018

+33-7

Commits on Sep 30, 2018

fix(mergeOptions): skip mixins and extends if child is already merged
KaelWD
committed

Commits on Oct 20, 2018

update test name

posva
and
KaelWD
authored

Commits on Nov 30, 2018

Update options.js
yyx990803
authored