Commit 99d9d9a470ca9b693f6dbee05f1cfcd98a5d148d

Edward Thomson 2015-10-26T17:44:36

merge: improve test names in recursive merge tests