[Bf-committers] Slow merges with recent changes
Αντώνης Ρυακιωτάκης
kalast at gmail.com
Mon Oct 24 21:42:35 CEST 2011
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
More information about the Bf-committers
mailing list