diff options
| author | Paul Eggert | 2011-11-13 20:35:22 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-13 20:35:22 -0800 |
| commit | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch) | |
| tree | e707b79a846623490feea39a4dceb86dd218eb4d /admin/notes | |
| parent | 6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff) | |
| parent | 56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff) | |
| download | emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip | |
Merge from trunk.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/bzr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index 12a3b194266..50eaf3710ee 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr | |||
| @@ -173,7 +173,7 @@ This restores file, but without its history (`bzr log file' will be | |||
| 173 | very short). This is because file gets re-added with a new file-id | 173 | very short). This is because file gets re-added with a new file-id |
| 174 | (use `bzr file-id file' to see the id). | 174 | (use `bzr file-id file' to see the id). |
| 175 | 175 | ||
| 176 | Insteading of adding the file, try: | 176 | Instead of adding the file, try: |
| 177 | 177 | ||
| 178 | bzr revert -rN file; bzr commit | 178 | bzr revert -rN file; bzr commit |
| 179 | 179 | ||