etcupdate: Trim trailing whitespace.

[jhb]

Summary

MFC after: 2 weeks

usr.sbin/etcupdate/etcupdate.sh

 
 # Output a diff of two directory entries with the same relative name
 # in different trees.  Note that as with compare(), this does not
 # recurse into subdirectories.  If the nodes are identical, nothing is
 # output.
 #
 # $1 - first tree
 # $2 - second tree
-# $3 - node name 
+# $3 - node name
 # $4 - label for first tree
 # $5 - label for second tree
 diffnode()
 {
         local first second file old new diffargs
 
         if [ -n "$FREEBSD_ID" ]; then
                 diffargs="-I \\\$FreeBSD.*\\\$"
merge_file()
         esac
 }
 
 # Returns true if a file contains conflict markers from a merge conflict.
 #
 # $1 - pathname of the file to resolve (relative to DESTDIR)
 has_conflicts()
 {
-        
         egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1
 }
 
 # Attempt to resolve a conflict.  The user is prompted to choose an
 # action for each conflict.  If the user edits the file, they are
 # prompted again for an action.  The process is very similar to
 # resolving conflicts after an update or merge with Perforce or
 # Subversion.  The prompts are modelled on a subset of the available
EOF
         rm -f $WARNINGS
         mkdir -p $CONFLICTS
 
         # Ignore removed files for the pre-world case.  A pre-world
         # update uses a stripped-down tree.
         if [ -n "$preworld" ]; then
                 > $WORKDIR/removed.files
         fi
-        
         # The order for the following sections is important.  In the
         # odd case that a directory is converted into a file, the
         # existing subfiles need to be removed if possible before the
         # file is converted.  Similarly, in the case that a file is
         # converted into a directory, the file needs to be converted
         # into a directory if possible before the new files are added.
 
         # First, handle removed files.