In my case I used svn merge -r41226:41227 --accept=theirs-conflict
This takes care of diffing only the $Id$ conflicts from this and the next 4 commits _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
