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
..
keepassxc-cli.1	CLI: Fix keyfile from/to parameter collision in merge command	2019-12-21 17:39:50 -05:00
keepassxc.1	Add keepassxc man page and move cli man page to share folder (#3665)	2019-10-25 20:45:38 +02:00