Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.i
data
journal.dirstate