test suite noticed a direct mode reversion

Annex/AutoMerge.hs

@@ -129,6 +129,9 @@ resolveMerge' unstagedmap (Just us) them u = do
 			| keyUs /= keyThem -> resolveby [keyUs, keyThem] $ do
 				makeannexlink keyUs LsFiles.valUs
 				makeannexlink keyThem LsFiles.valThem
+				-- cleanConflictCruft can't handle unlocked
+				-- files, so delete here.
+				unless (islocked LsFiles.valUs) $
 					liftIO $ nukeFile file
 			| otherwise -> do
 				-- Only resolve using symlink when both