bup: import merge_dict

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/main.py b/main.py
index 78da11de049689c7b81736a179d0e4c1a63463f3..05e62c41169b60f202777758c6cece7d5e98c36f 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -43,7 +43,7 @@ os.environ['BUP_RESOURCE_PATH'] = resourcepath
 
 from bup import compat, helpers
 from bup.compat import add_ex_tb, add_ex_ctx, wrap_main
-from bup.helpers import atoi, columnate, debug1, log, tty_width
+from bup.helpers import atoi, columnate, debug1, log, merge_dict, tty_width
 
 
 def usage(msg=""):