From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sat, 03 Dec 2005 10:32:55 GMT
Subject: [PATCH 0/4] Merge test cases
Message-ID: <20051203103255.GA4896@c165.ib.student.liu.se>

This series adds two test cases for merge strategies. The first one
test that something sensible is done in case of directory/file
conflicts, the second one tests a criss-cross merge.

- Fredrik