Lines Matching full:changes
91 It manages updates by doing a three-way merge of changes made to these
110 copies of each file to determine which changes need to be merged into the
115 If the local changes to a file conflict with the changes made to a file in
131 The default mode merges changes from the source tree to the destination
140 it compares the two trees merging changes into the destination directory.
192 will attempt to merge the changes into the version of the file in the
202 is not able to safely merge in changes to a file other than a merge conflict,
299 tree and generates a unified format diff of the changes.
336 Show all changes made to the merged file as a unified diff.
343 changes made to the file in the
349 tree and discard any local changes made to the file.
419 Ignore changes in the FreeBSD ID string when comparing files in the
428 this reduces noise due to FreeBSD ID string changes in the output.
430 by FreeBSD ID string changes.
458 this option may not have an effect if there are other changes in a file that
505 Do not merge any changes to the destination directory.
532 Only merge changes to files that are necessary to successfully run
601 Ignore changes in the FreeBSD ID string similar to the
668 To merge changes after an upgrade via the buildworld and installworld process:
725 the changes in the tree at
733 if a file changes from a file to a directory in the