FastForward merge should block if there are checkout conflicts.#781

nulltoken merged 1 commit intovNextlibgit2/libgit2sharp:vNextfrom

jamill/merge_fixlibgit2/libgit2sharp:jamill/merge_fixCopy head branch name to clipboard