three-merge spyder-ide/three-merge andrewammerlaan@gentoo.org Andrew Ammerlaan