test-merge-commit.t #1