xxdiff 4.0.1 (Qt: 4.8.7) Written by Martin Blais <blais@furius.ca>

xxdiff (cmdline.cpp:449): Usage: xxdiff [OPTIONS] file1 file2 [file3] A graphical file and directories comparison and merge tool. Generic options: --help Show help about options. --help-qt Show Qt specific options. --help-all Show all options. --help-html Output documentation in HTML. --version, -v Show version information. GNU diff options (2-files only): --ignore-all-space, -w Option passed to 2-files diff(1). Ignore white space when comparing lines. --ignore-space-change, -b Option passed to 2-files diff(1). Ignore changes in amount of white space. --ignore-case, -i Option passed to 2-files diff(1). Ignore changes in case; consider upper- and lower-case to be the same. --ignore-blank-lines, -B Option passed to 2-files diff(1). Ignore changes that just insert or delete blank lines. --recursive, -r Option passed to 2-files diff(1). This is only meaningful for directory diffs. --text, -a Option passed to 2-files diff(1). Treat all files as text and compare them line-by-line, even if they do not appear to be text. --exclude, -e <arg> When comparing directories, ignore files and subdirectories whose basenames match pattern. --exclude-from <arg> When comparing directories, ignore files and subdirectories whose basenames match any pattern contained in file. --args, -A <arg> Pass on argument to the subordinate diff program. Options: --no-rcfile Don't query rcfile resources (.xxdiffrc). --list-resources Lists all the supported resources and default values. --exit-on-same, -D If there are no differences then exit quietly with exit code of 0. --exit-if-no-conflicts, -E If there are no conflicts after making automatic merge selections, then exit quietly with exit code of 0. --exit-with-merge-status, -X If all diff hunks are selected and no unsaved selections exist, then exit with code of 0. Normally, xxdiff will pass back the diff return code. --single, -S Load a single file for display. This is a strange feature for those who like the display of code with xxdiff. --merge, -m Automatically select regions that would end up being selected by an automatic merge. --unmerge, -U Invoke on a single file with CVS-like merge conflicts, splitting the conflicts into two files for display. If this is specified, only a single file can then be given as argument. --unmerge3 Invoke on a single file with merge conflicts generated by diff3 with the show-all option, splitting the conflicts into three files for display. If this is specified, only a single file can then be given as argument. --resource, -R <arg> Pass on string 'str' to resource parser. Resources given in this manner on the command line supersede other resource mechanisms. One can specify multiple resource settings by repeating this option. --merged-filename, -M <arg> Specifies the filename of the merged file for output. --decision, -O Forces the user to take a decision upon exit. The user can choose between ACCEPT, REJECT or MERGED, in which case saving to the merged filename is forced (if the merged file exists, no warning is given about overwriting the file). If there are unresolved conflicts, a popup dialog will appear. If ACCEPT or REJECT are selected, no merged file is required. In all cases, a single line is output with the decision that was made. This generic functionality is useful for better integration with scripts that require some form of decision to be made by the user. --indicate-input-processed Indicate that the input files have been entirely processed and are not needed anymore by printing out the string INPUT-PROCESSED on stdout as soon as possible. This can be used by scripts which create temporary files to delete those as soon as xxdiff has finished reading them. This only works from startup. --use-temporary-files, -t Copies the input streams/files into temporary files to perform diffing. This is useful if you want to diff FIFOs. --prompt-for-files, -p <arg> If no files are specified on the command line, show a file dialog so that the user can select them. This option is ignored if any files are specified. Display Options: --title1 <arg> Display 'str' instead of filename in filename label 1 (left). --title2 <arg> Display 'str' instead of filename in filename label 2 (middle). --title3 <arg> Display 'str' instead of filename in filename label 3 (right). --titlein, -N <arg> Display 'str' for filename in given in stdin. --orig-xdiff Use settings as close as possible to original xdiff (for the romantics longing the old days of SGI... snif snif). --show-merged-pane Display the merged pane on startup. Any one specified file can be `-' for stdin. Filenames can be either 2 directories, 2 files or 3 files.