[PATCH] Enable and fix support for base less merges.