check the status of the local tree before checking out a package or attempting a merge
Merge pull request #65 from fwyzard/check-status-before-merge

check the status of the local tree before checking out a package or attempting a merge