[PATCH 0/4] Merge test cases
From: Fredrik Kuivinen <hidden>
Date: 2016-06-15 22:42:14
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