Richard Guenther <richard.guenther@gmail.com> writes: > Does svn rely on patch for merging No, it uses an internal diff3 algorithm. You can make it use an external diff3 program via the command line or the config file. > and can it be taught to use -l? The internal diff/merge will ignore whitespace if you use -x -w. -- Philip