# # # patch "tests/merging_(add_a,_rename_a_b)_with_(add_b)/__driver__.lua" # from [b37feaf5408df2ec82bf70df8ae3ca74d3199c90] # to [786cafd8e4801ba0ff1cb7cb7358f1f4b51058b5] # ============================================================ --- tests/merging_(add_a,_rename_a_b)_with_(add_b)/__driver__.lua b37feaf5408df2ec82bf70df8ae3ca74d3199c90 +++ tests/merging_(add_a,_rename_a_b)_with_(add_b)/__driver__.lua 786cafd8e4801ba0ff1cb7cb7358f1f4b51058b5 @@ -26,6 +26,7 @@ revert_to(revs.a) -- produce state C revert_to(revs.a) +writefile("bar", "extra blah blah foo") check(mtn("add", "bar"), 0, false, false) commit() revs.c = base_revision()