From 343132ec7fff4dd390beadfff6f376168e9ae028 Mon Sep 17 00:00:00 2001
From: Julien Valroff <julien@kirya.net>
Date: Sat, 4 Sep 2010 15:40:17 +0200
Subject: Don't pass --three-way option to ucf

---
 debian/mailgraph.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/mailgraph.postinst b/debian/mailgraph.postinst
index 652fb6c..4b73ef3 100644
--- a/debian/mailgraph.postinst
+++ b/debian/mailgraph.postinst
@@ -33,7 +33,7 @@ case "$1" in
                 sed -i -re "s@^(${foo%=*}=).*@\1\"${RET}\"@" "$tempfile"
         done
 
-        ucf --three-way --debconf-ok ${tempfile} /etc/default/mailgraph
+        ucf --debconf-ok ${tempfile} /etc/default/mailgraph
         ucfr mailgraph /etc/default/mailgraph
         rm -f ${tempfile}
     ;;
-- 
cgit v1.2.3