Lines Matching refs:an
41 # performing an update.
489 # Run one-off commands after an update has completed. These commands
585 # Grr, newaliases only works for an empty DESTDIR.
668 # Generate a conflict file when a "new" file conflicts with an
787 # As an extra sanity check, fail the attempt if the updated
856 # Attempt to resolve a conflict. The user is prompted to choose an
858 # prompted again for an action. The process is very similar to
859 # resolving conflicts after an update or merge with Perforce or
891 (e) edit - change merged file in an editor
1072 # If the removed file matches an ALWAYS_INSTALL glob,
1112 # file if it matches an ALWAYS_INSTALL glob. If the update
1134 # type, treat it like an added file just comparing the new and
1223 # file if it matches an ALWAYS_INSTALL glob. If the update
1310 # Requires an unmodified tree to diff against.
1332 # Unlike 'update', this command does not rotate or preserve an
1353 # Resolve conflicts left from an earlier merge.
1405 # Perform an actual merge. The new tree can either already exist (if
1550 # Run any special one-off commands after an update has completed.
1578 # If first arg is an option, assume the
1654 # specified patterns in an 'always' variable
1674 # specified patterns in an 'ignore' variable
1726 # The path of the "warnings" file that accumulates warning notes from an update.