packages feed

git-annex-6.20160318: doc/forum/Undo_git_merge_git-annex.mdwn

After accidentally typing git merge git-annex, I am now wondering how to clean up the resulting chaos...

Any tips?