1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
|
** --tk Pop up a TCL/TK-based GUI to show the diff
** --by Show a side-by-side diff in the default web browser
** -b Show a linear diff in the default web browser
** -y Show a text side-by-side diff
** --webpage Format output as HTML
** --webpage -y HTML output in the side-by-side format
**
** The "--from VERSION" option is used it specifies the source check-in
** for the diff operation. If not specified, the source check-in is the
** base check-in for the current check-out. Similarly, the "--to VERSION"
** option specifies the check-in from which the second version of the file
** or files is taken. If there is no "--to" option then the (possibly edited)
** files in the current check-out are used. The "--checkin VERSION" option
** shows the changes made by check-in VERSION relative to its primary parent.
** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME.
**
** The "-i" command-line option forces the use of Fossils own the internal
** diff logic rather than any external diff program that might be configured
** using the "setting" command. If no external diff program is configured,
** then the "-i" option is a no-op. The "-i" option converts "gdiff" into
** "diff".
**
** The "--diff-binary" option enables or disables the inclusion of binary files
** when using an external diff program.
**
** The "--binary" option causes files matching the glob PATTERN to be treated
** as binary when considering if they should be used with external diff program.
** This option overrides the "binary-glob" setting.
**
** These command show differences between managed files. Use the "fossil xdiff"
** command to see differences in unmanaged files.
**
** Options:
** --binary PATTERN Treat files that match the glob PATTERN
** as binary
|
|
|
|
|
|
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
|
** --tk Pop up a TCL/TK-based GUI to show the diff
** --by Show a side-by-side diff in the default web browser
** -b Show a linear diff in the default web browser
** -y Show a text side-by-side diff
** --webpage Format output as HTML
** --webpage -y HTML output in the side-by-side format
**
** The "--from VERSION" option is used to specify the source check-in
** for the diff operation. If not specified, the source check-in is the
** base check-in for the current check-out. Similarly, the "--to VERSION"
** option specifies the check-in from which the second version of the file
** or files is taken. If there is no "--to" option then the (possibly edited)
** files in the current check-out are used. The "--checkin VERSION" option
** shows the changes made by check-in VERSION relative to its primary parent.
** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME.
**
** The "-i" command-line option forces the use of Fossil's own internal
** diff logic rather than any external diff program that might be configured
** using the "setting" command. If no external diff program is configured,
** then the "-i" option is a no-op. The "-i" option converts "gdiff" into
** "diff".
**
** The "--diff-binary" option enables or disables the inclusion of binary files
** when using an external diff program.
**
** The "--binary" option causes files matching the glob PATTERN to be treated
** as binary when considering if they should be used with the external diff
** program. This option overrides the "binary-glob" setting.
**
** These command show differences between managed files. Use the "fossil xdiff"
** command to see differences in unmanaged files.
**
** Options:
** --binary PATTERN Treat files that match the glob PATTERN
** as binary
|
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
|
** --exec-abs-paths Force absolute path names on external commands
** --exec-rel-paths Force relative path names on external commands
** -r|--from VERSION Select VERSION as source for the diff
** -w|--ignore-all-space Ignore white space when comparing lines
** -i|--internal Use internal diff logic
** --json Output formatted as JSON
** -N|--new-file Alias for --verbose
** --numstat Show only the number of lines delete and added
** -y|--side-by-side Side-by-side diff
** --strip-trailing-cr Strip trailing CR
** --tcl TCL-formated output used internally by --tk
** --tclsh PATH TCL/TK used for --tk (default: "tclsh")
** --tk Launch a Tcl/Tk GUI for display
** --to VERSION Select VERSION as target for the diff
** --undo Diff against the "undo" buffer
|
|
|
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
|
** --exec-abs-paths Force absolute path names on external commands
** --exec-rel-paths Force relative path names on external commands
** -r|--from VERSION Select VERSION as source for the diff
** -w|--ignore-all-space Ignore white space when comparing lines
** -i|--internal Use internal diff logic
** --json Output formatted as JSON
** -N|--new-file Alias for --verbose
** --numstat Show only the number of added and deleted lines
** -y|--side-by-side Side-by-side diff
** --strip-trailing-cr Strip trailing CR
** --tcl TCL-formated output used internally by --tk
** --tclsh PATH TCL/TK used for --tk (default: "tclsh")
** --tk Launch a Tcl/Tk GUI for display
** --to VERSION Select VERSION as target for the diff
** --undo Diff against the "undo" buffer
|