t6021: add a new test for git-merge-resolve