t7610-mergetool: add missing && and remove commented-out code