Make a test case for the scenario causing problems in #362
Make a test case for the scenario causing problems in #362

I actually can't get this test to fail, but I think it should be
exercising the code path that was causing @adelsz problems

automerge/automerge,automerge/automerge