From fd9d372e6ab9780cb433d8ec334fcedd6550290c Mon Sep 17 00:00:00 2001
From: Louis-Bertrand Varin <louisv@unito.io>
Date: Sun, 12 Mar 2017 14:17:03 -0400
Subject: [PATCH] Adding second prompt for merge.

---
 src/cli/Merge.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp
index 118213b80..aa399dd5b 100644
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -52,7 +52,7 @@ int Merge::execute(int argc, char** argv)
         return EXIT_FAILURE;
     }
 
-    out << "Insert the database password\n> ";
+    out << "Insert the first database password\n> ";
     out.flush();
     
     static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
@@ -64,6 +64,8 @@ int Merge::execute(int argc, char** argv)
       key2 = *key1.clone();
     }
     else {
+      out << "Insert the second database password\n> ";
+      out.flush();
       QString line2 = inputTextStream.readLine();
       key2 = CompositeKey::readFromLine(line2);
     }