winmerge shell script treats arguments properly; remove diff-specific hack