On Fri, Nov 14, 2008 at 09:35:08PM -0800, Junio C Hamano wrote: > > -'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]... > > I wonder why this even needs to be an option. If you do not want to > resolve all of them, you can limit the amount of work you would do by > giving list of paths to work on, can't you? I don't know about Charles, but I often don't know that I don't want to merge a file using the graphical tool until I see it in the graphical tool. IOW, I start trying to merge it there and realize the conflict is such that I am better off doing it in my editor with conflict markers. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
