t / lib-httpd / passwdon commit restore: replace --force with --ignore-unmerged (a5e5f39)
   1user@host:xb4E8pqD81KQs