Back out of a merge

Your task Merge title and see the conflict. Cancel it with git merge --abort. Then run git status and see that the folder is clean again.

Getting the editor ready