git4idea: Fixed options on merge and pull dialogs to better reflect git option depend...