It seems like you might have your default merge tool set up to do diffs instead of set up as your difftool. I wouldn't recommend doing this (i.e. making git diff use winmerge).
If you want to send me your config file for git I can recommend how you should improve it - probably don't want to send it to the whole list, if you want to take this offline. Kelly On Mon, Aug 22, 2011 at 11:34 AM, hammett <[email protected]> wrote: > Sorry for being such a newbie.. but I'm trying to generate a concise > diff file with the changes. Running git diff master other/master is > opening winmerge for every single file, changed or not :-$ > > Thanks! > > -- > Cheers, > hammett > http://hammett.castleproject.org/ > > -- > You received this message because you are subscribed to the Google Groups > "Castle Project Development List" group. > To post to this group, send email to [email protected] > . > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/castle-project-devel?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Castle Project Development List" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/castle-project-devel?hl=en.
