If you want to check out a local working branch based on origin/test you need to check it out with

git checkout -b test origin/test

another source:
git merge --abort
This attempts to reset your working copy to whatever state it was in before the merge. That means that it should restore any uncommitted changes from before the merge, although it cannot always do so reliably. Generally you shouldn't merge with uncommitted changes anyway.

Labels: ,