Add CLI --dry-run option for merge (#3254)

2019-06-18 21:45:24 -04:00
parent 9e06dc0d5c
commit 84eec03cb7
9 changed files with 98 additions and 35 deletions
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -401,7 +401,6 @@ MainWindow::MainWindow()
    connect(m_ui->actionUserGuide, SIGNAL(triggered()), SLOT(openUserGuide()));
    connect(m_ui->actionOnlineHelp, SIGNAL(triggered()), SLOT(openOnlineHelp()));

-
 #ifdef Q_OS_MACOS
    setUnifiedTitleAndToolBarOnMac(true);
    if (macUtils()->isDarkMode()) {