From: David Aguilar Date: Tue, 14 Aug 2012 07:07:26 GMT Subject: What should mergetool do with --no-prompt? Message-ID: Right now there are two code paths, resolving deletion conflicts and resolving symlink conflicts, in git-mergetool that do not honor --no-prompt. They force user-interaction with the shell even though the caller (such as a program) said that they do not want to be prompted. This was an oversight from when this option was first added. I think a simple and sensible thing to do would be for mergetool to skip over these entries when --no-prompt is supplied. Does this sound like a good idea? -- David