Wizz 0654ffc117 CLI: Fix keyfile from/to parameter collision in merge command
Rename 'k' to 'f' because 'k' is already used to specify the key for the target database of the merge

* Remove short -f option from keepassxc-cli.1
* Remove -f option from keepassxc-cli merge
* Add test cases covering cli options for merge
* Add functional test for merge with keys
2019-12-21 17:39:50 -05:00
..
2019-09-22 18:11:40 -04:00
2018-11-28 18:29:15 -05:00
2018-12-18 22:28:56 -05:00
2019-11-23 10:07:39 -05:00
2018-03-31 16:01:30 -04:00
2015-09-12 13:55:50 +02:00
2017-10-21 13:15:02 +02:00
2019-12-21 09:22:16 -05:00
2018-11-28 18:29:15 -05:00
2018-03-31 16:01:30 -04:00
2019-10-20 18:56:41 -04:00
2019-11-23 10:07:39 -05:00
2018-11-28 18:29:15 -05:00
2018-03-31 16:01:30 -04:00
2018-11-28 18:29:15 -05:00
2018-12-18 22:28:56 -05:00
2018-05-22 09:28:54 +02:00
2019-10-20 17:57:51 -04:00
2019-04-11 08:52:51 -04:00
2019-03-19 18:56:17 -04:00
2018-03-31 16:01:30 -04:00