From be2c77d0cb9cedc3750efa0d449efe1aef83246f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Jul 2014 15:08:30 -0400 Subject: [PATCH] close --- doc/bugs/files_lost_during_upgrade.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/files_lost_during_upgrade.mdwn b/doc/bugs/files_lost_during_upgrade.mdwn index 7c38af7c43..afab38d81a 100644 --- a/doc/bugs/files_lost_during_upgrade.mdwn +++ b/doc/bugs/files_lost_during_upgrade.mdwn @@ -2186,3 +2186,6 @@ channel 4: bad ext data # End of transcript or log. """]] + +> [[fixed|done]]; the merge race has been fixed. The upgrade loop has also +> been dealt with. --[[Joey]]