Fix always kill in options#708

SimonCropp merged 3 commits into

mainVerifyTests/DiffEngine:mainfrom

fix-always-kill-in-optionsVerifyTests/DiffEngine:fix-always-kill-in-optionsCopy head branch name to clipboard