t / lib-httpd / passwdon commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1user@host:nKpa8pZUHx/ic