#
#
# patch "tests/creating_a_bad_criss-cross_merge/alice.lua"
#  from [c29874140a27ed0d34c81f4270be3ef0a2d3e88f]
#    to [02b0fead5d4ecf47c14496e189c30ada2c72285b]
# 
# patch "tests/creating_a_bad_criss-cross_merge/bob.lua"
#  from [d3140fbd519c4fcc6d1dedd38b712f7f02431742]
#    to [f4c3348ee7325839806c193196f08774b6fcd682]
#
============================================================
--- tests/creating_a_bad_criss-cross_merge/alice.lua	c29874140a27ed0d34c81f4270be3ef0a2d3e88f
+++ tests/creating_a_bad_criss-cross_merge/alice.lua	02b0fead5d4ecf47c14496e189c30ada2c72285b
@@ -8,7 +8,7 @@ function get_revision_cert_trust(signers
 
 function get_revision_cert_trust(signers, id, name, val)
    for k,v in pairs(signers) do 
-        if (v ~= "bob") then return true end
+        if (v.given_name ~= "bob") then return true end
    end
    return false
 end
============================================================
--- tests/creating_a_bad_criss-cross_merge/bob.lua	d3140fbd519c4fcc6d1dedd38b712f7f02431742
+++ tests/creating_a_bad_criss-cross_merge/bob.lua	f4c3348ee7325839806c193196f08774b6fcd682
@@ -8,7 +8,7 @@ function get_revision_cert_trust(signers
 
 function get_revision_cert_trust(signers, id, name, val)
    for k,v in pairs(signers) do 
-        if (v ~= "alice") then return true end
+        if (v.given_name ~= "alice") then return true end
    end
    return false
 end