Commit b1eef912cffb9e3ce9792b6aee816c1a45c85fb0

Edward Thomson 2015-10-27T18:00:30

merge: add recursive test with conflicting contents