| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | doc/pacman.8.txt | 5 |
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 3fef08dc..5c57450b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -484,8 +484,9 @@ original=X, current=Y, new=Z:: original=NULL, current=Y, new=Z:: The package was not previously installed, and the file already exists on the - file system. Save the current file with a '.pacorig' extension, install the - new file, and warn the user. + file system. Install the new file with a '.pacnew' extension and warn the + user. The user must then manually merge any necessary changes into the + original file. Examples |