t / lib-httpd / passwdon commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1user@host:xb4E8pqD81KQs