# # # patch "tests/resolve_conflicts_errors/__driver__.lua" # from [0fd2b34544713dc4d497b20b775b5320916983ff] # to [216683714aca7ef676ff4762a752305134378340] # ============================================================ --- tests/resolve_conflicts_errors/__driver__.lua 0fd2b34544713dc4d497b20b775b5320916983ff +++ tests/resolve_conflicts_errors/__driver__.lua 216683714aca7ef676ff4762a752305134378340 @@ -93,7 +93,7 @@ check("mtn: misuse: other resolution mus -- not in workspace; report nice error; conflicts file must be under -- _MTN, so need workspace. Fixes bug 30473 -check(indir("..", mtn("conflicts", "store", "--db", "resolve_conflicts_errors/test.db", "--branch=testbranch"), 1, nil, true)) +check(indir("..", mtn("conflicts", "store", "--db", "resolve_conflicts_errors/test.db", "--branch=testbranch")), 1, nil, true) check(grep("workspace required but not found", "stderr"), 0, true) check(grep("conflicts file must be under _MTN", "stderr"), 0, true)