From 0990d745744e11edd24f9bacdfc788f9c8d341d4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 28 Dec 2020 16:05:14 -0400
Subject: [PATCH] revert recent lockContent change

lockContent should only be done when it's versioned
---
 Remote/Helper/ExportImport.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Remote/Helper/ExportImport.hs b/Remote/Helper/ExportImport.hs
index 878ce112e6..73097c9e45 100644
--- a/Remote/Helper/ExportImport.hs
+++ b/Remote/Helper/ExportImport.hs
@@ -165,7 +165,7 @@ adjustExportImport' isexport isimport r rs = do
 						then giveup "dropping content from this remote is not supported because it is configured with importtree=yes"
 						else removeKey r k
 				else removeKey r k
-		, lockContent = if versioned || not mergeable
+		, lockContent = if versioned
 			then lockContent r
 			else Nothing
 		, retrieveKeyFile = \k af dest p ->