From: saurabh gupta Date: Fri, 13 Mar 2009 03:15:04 GMT Subject: Re: Google Summer of Code 2009: GIT Message-ID: In-Reply-To: On Fri, Mar 13, 2009 at 2:15 AM, wrote: > > when I am mentioning config files here I'm thinking of ones that don't use > XML (such as the git config file) > > a 'paragraph' merge driver could also help with things like a maintainers > file where the order of the paragaphs doesn't matter, just the content > inside each one. > > that's very similar to re-ordering XML tags, but with a slightly different > syntax yes, in that case, I think we can modify the existing text merge driver somewhat and provide these configuration options to the user. User can choose the option to configure the merge operation. -- Saurabh Gupta Senior, NSIT,New Delhi, India