I want to resolve merge conflicts using vimdiff. Assuming I have two conflicts in the same file and I want to resolve the first on by taking the LOCAL and the second by taking t
