#
#
# patch "tests/resolve_conflicts_content/conflicts-2"
#  from [078e55476cd7a8f25217f096dc852383104ea761]
#    to [9dbe490ea9bae5cac631c4e445c84048a57ca89b]
# 
# patch "tests/ssh_agent/__driver__.lua"
#  from [64673ffc0fa2da46b0840938dd99195435da3bb2]
#    to [2d35382c6911efcb06b1b30b8093bbe134b3557b]
#
============================================================
--- tests/resolve_conflicts_content/conflicts-2	078e55476cd7a8f25217f096dc852383104ea761
+++ tests/resolve_conflicts_content/conflicts-2	9dbe490ea9bae5cac631c4e445c84048a57ca89b
@@ -1,4 +1,4 @@
-left [36cfb5960784df07636cc9d119617326fe87c3f6]
+    left [36cfb5960784df07636cc9d119617326fe87c3f6]
    right [be155249f011e658f913c109bafd743b1bfea0fe]
 ancestor [574e08409c35c5c0eb6e929bf1e3abf49a8bacd4]
 
============================================================
--- tests/ssh_agent/__driver__.lua	64673ffc0fa2da46b0840938dd99195435da3bb2
+++ tests/ssh_agent/__driver__.lua	2d35382c6911efcb06b1b30b8093bbe134b3557b
@@ -55,6 +55,9 @@ check(not exists("id_monotone3"))
 check(not exists("id_monotone3"))
 
 -- * (E) export to path that's not writable
+-- we don't know how to do this on windows
+
+skip_if(ostype == "Windows")
 skip_if(not existsonpath("chmod"))
 
 mkdir("unwritable")