Report short sources as conflicts during apply#63

bluekeyes merged 1 commit intomasterbluekeyes/go-gitdiff:masterfrom

bkeyes/conflict-on-short-srcbluekeyes/go-gitdiff:bkeyes/conflict-on-short-srcCopy head branch name to clipboard