Fix off-by-one error in git-merge