Add tests for merge conflict due to unstaged conflicting change.#391

jdblischak wants to merge 1 commit intoropensci:mainropensci/git2r:mainfrom

jdblischak:unstaged-merge-conflictjdblischak/git2r:unstaged-merge-conflictCopy head branch name to clipboard