Add a new test for git-merge-resolve