Abort any merge

src/freedombone-utils-git

         echo $'git_pull no repo specified'
     fi
 
+    git merge --abort
     git stash
     git remote set-url origin $1
     git checkout master