Options for Comparing and Merging FoldersThe KDiff3 preferences (menu → ) has a section called "Folder Merge" with these options:
- Recursive folders
Select whether to search folders recursively.
- File pattern(s):
Only files that match any pattern here will be put in the tree. More than one pattern may be specified here by using the semicolon ";" as separator. Valid wildcards: '*' and '?'. (e.g. "
*.cpp;*.h"). Default is "*". This pattern is not used on folders.- File-anti-pattern(s):
Files that match this pattern will be excluded from the tree. More than one pattern may be specified here via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default is "
*.orig;*.o;*.obj".- Folder-anti-pattern(s):
Folders that match this pattern will be excluded from the tree. More than one pattern may be specified here via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default is "
CVS;deps;.svn".- Use Ignore File
Ignore files and folders that would also be ignored by the your source control. Many automatically generated files are ignored using ignore lists. The big advantage is that this can be folder-specific via a local ignore file. (See version control docs for more detail.)
- Find hidden files and folders
On some file systems files have an "Hidden"-attribute. On other systems a filename starting with a dot "." causes it to be hidden. This option allows you to decide whether to include these files in the tree or not. Default is on.
- Follow file links
For links to files: When disabled, then the symbolic links are compared. When enabled, then the files behind the links are compared. Default is off.
- Follow folder links
For links to folders: When disabled, then the symbolic links will be compared. When enabled then the link will be treated like a folder and it will be scanned recursively. (Note that the program doesn't check if the link is "recursive". So for example a folder that contains a link to the folder would cause an infinite loop, and after some time when the stack overflows or all memory is used up, crash the program.) Default is off.
- Case sensitive filename comparison
Default is false on Windows®, true for other operating systems.
- File Comparison Mode:
- Binary comparison
This is the default file comparison mode.
- Full analysis
Do a full analysis of each file and show the statistics information columns. (Number of Solved, Unsolved, Nonwhite and White conflicts.) The full analysis is slower than a simple binary analysis, and much slower when used on files that don't contain text. (Specify the appropriate file-antipatterns.)
- Trust the size and modification date (unsafe)
If you compare big folders over a slow network, it might be faster to compare the modification dates and file length alone. But this speed improvement comes with the price of a little uncertainty. Use this option with care. Default is off.
- Trust the size (unsafe)
Similar to trusting the modification date. No real comparison happens. Two files are considered equal if their file-sizes are equal. This is useful when the file-copy operation didn't preserve the modification date. Use this option with care. Default is off.
- Synchronize folders
Activates sync-mode when two folders are compared and no explicit destination folder was specified. In this mode the proposed operations will be chosen so that both source folders are equal afterwards. Also the merge result will be written to both folders. Default is off.
- Copy newer instead of merging (unsafe)
Instead of merging the proposed operation will copy the newer source if changes happened. (Considered unsafe, because it implies that you know, that the other file hasn't been edited too. Check to make sure in every case.) Default is off.
- Backup files (.orig)
If a file or complete folder is replaced by another or is deleted then the original version will be renamed with an
.origextension. If an old backup file with.origextension already exists then this will be deleted without backup. This also affects the normal merging of single files, not only in folder-merge mode. Default is on.