[[!comment format=mdwn username="http://joeyh.name/" ip="4.153.8.243" subject="comment 3" date="2012-05-31T17:01:37Z" content=""" `dead` is the best we can do. The automatic merging used on the git-annex branch tends to re-add lines that are deleted in one repo when merging with another that still has them. """]]