From de7ddf3257b6217bc8c22d1ddfb402eb73a94384 Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Wed, 26 Jul 2017 00:33:15 +0200
Subject: Remove erroneous 'filedb' db name from python merge

---
 tools/mergetools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/mergetools.py')

diff --git a/tools/mergetools.py b/tools/mergetools.py
index 62b11e4..95742dc 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -439,7 +439,7 @@ def parse_args(parser=None):
     return (args, config, localconfig)
 
 def perm(dbtype, path):
-    if dbtype == "filedb":
+    if dbtype == "fsdb":
         return FileDB(path)
     elif dbtype == "permdb":
         return PermDB(path)
-- 
cgit v1.1