#
#
# patch "tests/resolve_conflicts_content/conflicts-2"
#  from [43c4ca47a7c43059cb50aa4a3f91a878480f8955]
#    to [078e55476cd7a8f25217f096dc852383104ea761]
# 
# patch "tests/resolve_conflicts_orphaned_file/__driver__.lua"
#  from [c9a7317754a51e9586460e6f6b0c40087cba0195]
#    to [0a61e242c11bc9e4f9632e8e1c30d65709b885ce]
#
============================================================
--- tests/resolve_conflicts_content/conflicts-2	43c4ca47a7c43059cb50aa4a3f91a878480f8955
+++ tests/resolve_conflicts_content/conflicts-2	078e55476cd7a8f25217f096dc852383104ea761
@@ -1,4 +1,3 @@
-
 left [36cfb5960784df07636cc9d119617326fe87c3f6]
    right [be155249f011e658f913c109bafd743b1bfea0fe]
 ancestor [574e08409c35c5c0eb6e929bf1e3abf49a8bacd4]
============================================================
--- tests/resolve_conflicts_orphaned_file/__driver__.lua	c9a7317754a51e9586460e6f6b0c40087cba0195
+++ tests/resolve_conflicts_orphaned_file/__driver__.lua	0a61e242c11bc9e4f9632e8e1c30d65709b885ce
@@ -30,6 +30,7 @@ check(mtn("conflicts", "show_first"), 0,
 
 -- Check suggested resolutions for orphaned directory
 check(mtn("conflicts", "show_first"), 0, nil, true)
+canonicalize("stderr")
 check(
 "mtn: orphaned node stuff/dir1\n" ..
 "mtn: possible resolutions:\n" ..
@@ -51,6 +52,7 @@ check(mtn("conflicts", "show_first"), 0,
 
 -- Check suggested resolutions for orphaned file
 check(mtn("conflicts", "show_first"), 0, nil, true)
+canonicalize("stderr")
 check(
 "mtn: orphaned node stuff/file2\n" ..
 "mtn: possible resolutions:\n" ..