[pkg-haskell-tools] 02/02: upgrade: Also suggest hdiff when merge failed

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 17725df404ef13207e4a6daeabd25206d57e54fb
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun May 29 12:08:37 2016 +0200

    upgrade: Also suggest hdiff when merge failed
---
 debian/changelog | 6 ++++++
 scripts/upgrade  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 54c0c68..42a6bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkg-haskell-tools (0.10.3) UNRELEASED; urgency=medium
+
+  * dht upgrade: Minor improvements. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 29 May 2016 12:08:45 +0200
+
 pkg-haskell-tools (0.10.2) unstable; urgency=medium
 
   [ Joachim Breitner ]
diff --git a/scripts/upgrade b/scripts/upgrade
index dfa6476..9d88d3d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -131,6 +131,7 @@ do
     echo "Upgraded $cabal_name to $version"
     echo "Merge failed. Please resolve and then run"
     echo "git add -u .; git commit -v"
+    echo "Please also check http://hdiff.luite.com/cgit/$cabal_name/diff/?id=$version&id2=$old_version for interesting changes."
   fi
   if test -d debian/patches
   then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git