#
#
# patch "tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout"
#  from [d5c917a78297e3c2abc113d04eaae5f61ae44e23]
#    to [2e696c102e7388389e5117fd0cba1e736bef7ee3]
# 
# patch "tests/resolve_duplicate_name_conflict/__driver__.lua"
#  from [716390290b2ca16849455a5f65e1d61a183ea9ef]
#    to [fd81c83e6371e4065e784cb8dbf3b2bdf0c0d0cb]
#
============================================================
--- tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout	d5c917a78297e3c2abc113d04eaae5f61ae44e23
+++ tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout	2e696c102e7388389e5117fd0cba1e736bef7ee3
@@ -1,8 +1,8 @@ ancestor [51ccdc67277ec1461e1140df66fd00
     left [3e5ae9c2084d1ab530cd9690bac5e45ee6db7ade]
    right [e7d401d9de91696feaf17569337d10ed6e02a9b5]
 ancestor [51ccdc67277ec1461e1140df66fd00d56db3e7b5]
 
-     conflict "duplicate name"
+     conflict duplicate_name
     left_type "added file"
     left_name "foo/x"
  left_file_id [75e12a4830b87d440b8ecadbdbcdf20842278d30]
============================================================
--- tests/resolve_duplicate_name_conflict/__driver__.lua	716390290b2ca16849455a5f65e1d61a183ea9ef
+++ tests/resolve_duplicate_name_conflict/__driver__.lua	fd81c83e6371e4065e784cb8dbf3b2bdf0c0d0cb
@@ -43,11 +43,13 @@ parsed = parse_basic_io(readfile("stdout
 check (mtn("automate", "show_conflicts"), 0, true, false)
 parsed = parse_basic_io(readfile("stdout"))
 
+-- The Lua parser returns the 'conflict <symbol>' line as two lines
+-- with no values, so the line count here seems odd.
 check_basic_io_line (1, parsed[1], "left", abe_1) -- 1337..
 check_basic_io_line (2, parsed[2], "right", beth_1) -- d5f1..
 check_basic_io_line (3, parsed[3], "ancestor", base)
 
-check_basic_io_line (7, parsed[7], "left_file_id", "61b8d4fb0e5d78be111f691b955d523c782fa92e")
+check_basic_io_line (8, parsed[8], "left_file_id", "61b8d4fb0e5d78be111f691b955d523c782fa92e")
 
 -- mtn is not up to actually doing the merge of checkout.sh yet, so we
 -- just drop beth's version