Fix mergeBranchIntoCurrentBranch for conflicted state#605

tiennou merged 1 commit intolibgit2:masterlibgit2/objective-git:masterfrom

slavikus:upstream-masterslavikus/objective-git:upstream-masterCopy head branch name to clipboard