Add functionality to detect build 'conflicts' while merging#64

dleen wants to merge 4 commits into

mhagger:mastermhagger/git-imerge:masterfrom

dleen:builddleen/git-imerge:buildCopy head branch name to clipboard