comparison mercurial/commands.py @ 6352:34e4f4ef4936

removed trailing spaces
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 22 Mar 2008 20:03:00 +0100
parents 3b42f7ac6916
children 04d615b2d5e9
comparison
equal deleted inserted replaced
6349:6aaf5b1d8f15 6352:34e4f4ef4936
2129 2129
2130 This only removes files from the current branch, not from the entire 2130 This only removes files from the current branch, not from the entire
2131 project history. -A can be used to remove only files that have already 2131 project history. -A can be used to remove only files that have already
2132 been deleted, -f can be used to force deletion, and -Af can be used 2132 been deleted, -f can be used to force deletion, and -Af can be used
2133 to remove files from the next revision without deleting them. 2133 to remove files from the next revision without deleting them.
2134 2134
2135 The following table details the behavior of remove for different file 2135 The following table details the behavior of remove for different file
2136 states (columns) and option combinations (rows). The file states are 2136 states (columns) and option combinations (rows). The file states are
2137 Added, Clean, Modified and Missing (as reported by hg status). The 2137 Added, Clean, Modified and Missing (as reported by hg status). The
2138 actions are Warn, Remove (from branch) and Delete (from disk). 2138 actions are Warn, Remove (from branch) and Delete (from disk).
2139 2139