Don't try to malloc 0 bytes in xmerge#7

ethomson merged 1 commit into

mainlibgit2/xdiff:mainfrom

ethomson/xmerge_malloc_zerolibgit2/xdiff:ethomson/xmerge_malloc_zeroCopy head branch name to clipboard