From a5630e988bdd5686bdf4be42580711cffb11435b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg" Date: Thu, 14 Nov 2013 16:21:12 +0000 Subject: [PATCH] --- doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn index 857603bed0..5b817e2148 100644 --- a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn +++ b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn @@ -1,5 +1,5 @@ ### Please describe the problem. -Minor issue. +(Minor issue.) Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted.