[GiNaC-devel] (git) spurious merges