[merge] bug fix: don't put extra gap space when editing all compared files