Git: fix SoureTree's ksdiff merge command

Its default is stupid. We fix it.