From 3c0c77388bb4e6d66901b95a1cf77da0071b4e02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 19 Dec 2012 12:46:35 -0400
Subject: comment

---
 Annex/Direct.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Annex')

diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index 6ddea08fb..77a544257 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -153,7 +153,12 @@ mergeDirectCleanup d oldsha newsha = do
 		nukeFile f
 		void $ catchMaybeIO $ removeDirectory $ parentDir f
 	
-	{- Key symlinks are replaced with their content, if it's available. -}
+	{- The symlink is created from the key, rather than moving in the
+	 - symlink created in the temp directory by the merge. This because
+	 - a conflicted merge will write to some other file in the temp
+	 - directory.
+	 -
+ 	 - Symlinks are replaced with their content, if it's available. -}
 	movein k f = do
 		l <- calcGitLink f k
 		liftIO $ replaceFile f $ const $
-- 
cgit v1.2.3