From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 19 Dec 2007 18:00:15 +0000 (+0000)
Subject: Don't assume there is always a stage 2 in git.get_conflicts
X-Git-Tag: v0.15-rc1~320
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/40bd629038e0166f931c4e39b1ee5511d6dc18c1?hp=40bd629038e0166f931c4e39b1ee5511d6dc18c1

Don't assume there is always a stage 2 in git.get_conflicts

For example, the t1202-push-undo.sh test generates a conflict where a
file was added in both current and patch but different content and
missing in ancestor, therefore no stage 2.

There could also be a case where stage 3 is missing if a file is
removed by the patch being pushed.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---