Hey, Dmitry. I'm so sorry I sent my last email on your original patch before I saw this new series. I do now like your original proposal better, since it shows the diff based the names the caller provides, which I now agree is probably the clearest and most robust solution. The second patch in this series could still go through, though, no matter what version of the change to test_expect_equal_file we go with. jamie.