summaryrefslogtreecommitdiff
path: root/doc/bugs/files_lost_during_upgrade.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/bugs/files_lost_during_upgrade.mdwn')
-rw-r--r--doc/bugs/files_lost_during_upgrade.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/bugs/files_lost_during_upgrade.mdwn b/doc/bugs/files_lost_during_upgrade.mdwn
index 7c38af7c4..afab38d81 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]]