aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs/Assistant_merge_loop.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-09 15:18:00 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-09 15:18:00 -0400
commit06acd390fbc2340c5878cbf3831e058f71080988 (patch)
tree968f07a1746b72df9656a4fd390d28415b502f1a /doc/bugs/Assistant_merge_loop.mdwn
parent7a62581096d328a0403944286125c1bab8be0edc (diff)
Really fix bug that caused the assistant to make many unncessary empty merge commits.
Diffstat (limited to 'doc/bugs/Assistant_merge_loop.mdwn')
-rw-r--r--doc/bugs/Assistant_merge_loop.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_merge_loop.mdwn b/doc/bugs/Assistant_merge_loop.mdwn
index d0d710866..edff5e4b3 100644
--- a/doc/bugs/Assistant_merge_loop.mdwn
+++ b/doc/bugs/Assistant_merge_loop.mdwn
@@ -14,3 +14,6 @@ Using the standalone build, 64bit, on ArchLinux, Fedora 20 and Ubuntu 14.04.
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
+
+> [[fixed|done]]. Note that 5.20140708 contained an incomplete fix for this
+> bug. --[[Joey]]