[PATCH] Fixes problem with --merge-order head ^head