From: Jon Seymour <jon.seymour@gmail.com>
Date: Wed, 6 Jul 2005 16:39:35 +0000 (+1000)
Subject: [PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
X-Git-Tag: v0.99~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ff9206e72c71aa2e51c7cbee911f47b5838a5845?hp=ff9206e72c71aa2e51c7cbee911f47b5838a5845

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

This patch passes the test case introduced by the previous patch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---