#
#
# patch "tests/automate_show_conflicts_defaults/__driver__.lua"
#  from [8bf64504ef078a917ff74b73d99d53e34fddda56]
#    to [bb8f4e10d941d1580cb84f70d16c0241b39ec6b1]
#
============================================================
--- tests/automate_show_conflicts_defaults/__driver__.lua	8bf64504ef078a917ff74b73d99d53e34fddda56
+++ tests/automate_show_conflicts_defaults/__driver__.lua	bb8f4e10d941d1580cb84f70d16c0241b39ec6b1
@@ -44,7 +44,6 @@ check(mtn_ws_opts("automate", "show_conf
 -- mtn: [right] d8a8bc9623c1ff9c0a5c082e40f0ff8ec6b43e72 = chuck_1
 
 check(mtn_ws_opts("automate", "show_conflicts"), 0, true, false)
-
 parsed = parse_basic_io(readfile("stdout"))
 
 check_basic_io_line (1, parsed[1], "left", beth_1)
@@ -52,7 +51,7 @@ check_basic_io_line (3, parsed[3], "ance
 check_basic_io_line (3, parsed[3], "ancestor", base_2)
 
 --  Check that 'automate show_conflicts' works outside workspace when options are specified
-non_ws_dir = test.root .. "/.."
+non_ws_dir = make_temp_dir() 
 check(indir(non_ws_dir, mtn_outside_ws("automate", "show_conflicts", "--branch=testbranch")), 0, true, false)
 
 parsed = parse_basic_io(readfile("stdout"))