[PATCH] Replace merge-base implementation