summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-05-19 01:39:36 +0200
committerAllan McRae <allan@archlinux.org>2013-05-29 06:08:03 +0200
commit9555ec714a2113144b0bb09e468662d67f60857e (patch)
tree8267cb9e84b10d0ff1b17b716012a6dd509c5831
parente5dd8c2ac561173c93849c4baab6be2406679be5 (diff)
downloadpacman-9555ec714a2113144b0bb09e468662d67f60857e.tar.gz
pacman-9555ec714a2113144b0bb09e468662d67f60857e.tar.xz
pacman.8: document .pacorig files
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/pacman.8.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 189e1137..36b56179 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -445,6 +445,11 @@ original=X, current=Y, new=Z::
extension and warn the user. The user must then manually merge any
necessary changes into the original file.
+original=NULL, current=Y, new=Z::
+ Package was not previously installed and the file already exists on the
+ filesystem. Save the current file with a '.pacorig' extension, install the
+ new file, and warn the user.
+
Examples
--------