[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)