Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-03-13 09:36:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Add -d dry-run shortcut to merge command

Browse Source 
* Fixes #11191
This commit is contained in:
Jonathan White 2024-08-21 22:34:00 -04:00
parent 78cff4b6d9
commit 0e59f2745e
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/Merge.cpp
View File

@ -36,7 +36,7 @@ const QCommandLineOption Merge::NoPasswordFromOption =
QObject::tr("Deactivate password key for the database to merge from.")); QObject::tr("Deactivate password key for the database to merge from."));
const QCommandLineOption Merge::DryRunOption = const QCommandLineOption Merge::DryRunOption =
QCommandLineOption(QStringList() << "dry-run", QCommandLineOption(QStringList() << "d" << "dry-run",
QObject::tr("Only print the changes detected by the merge operation.")); QObject::tr("Only print the changes detected by the merge operation."));
const QCommandLineOption Merge::YubiKeyFromOption(QStringList() << "yubikey-from", const QCommandLineOption Merge::YubiKeyFromOption(QStringList() << "yubikey-from",