merge: don't open COMMIT_MSG unless we need to append conflicts