summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index cd1ed61d..1a982545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ propellor (0.8.3) UNRELEASED; urgency=medium
its origin remote. This avoids relying on the security of the github
repository when using the Debian package.
* The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
- and a newer version is available from origin.
+ and a newer version is available, after which git merge upstream/master
+ can be run to merge it.
* Included the config.hs symlink to config-simple.hs in the cabal and Debian
packages.