On Wed, Apr 18, 2007 at 01:35:05PM -0700, Linus Torvalds wrote: > So maybe each strategy could have "sub-strategies" for other file types. > > Ie something like > > [merge "ours"] > name = pick our own version > driver = /bin/true > symlinks = /bin/true or different attributes for other file types: [attr] *@ merge=ours # for symlinks [attr] */ merge=submodule # for dirlinks -- Martin Waitz
Attachment:
signature.asc
Description: Digital signature