summaryrefslogtreecommitdiff
path: root/doc/bugs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-05 17:12:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-05 17:12:05 -0400
commit5edba1bfe62ac4e77906b5b0057280d2d616c61e (patch)
tree9fa17a7e67fa3d3159318a4a318c55938327020f /doc/bugs
parentdc7c9a5db72ff05d5eb835f2406f2626a33553df (diff)
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
Diffstat (limited to 'doc/bugs')
-rw-r--r--doc/bugs/Assistant_merge_loop.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_merge_loop.mdwn b/doc/bugs/Assistant_merge_loop.mdwn
index d0d710866..de5b3a996 100644
--- a/doc/bugs/Assistant_merge_loop.mdwn
+++ b/doc/bugs/Assistant_merge_loop.mdwn
@@ -14,3 +14,5 @@ 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]] --[[Joey]]