examples: merge: add -d to getopt
examples: merge: do not truncate output files on dry run
examples: merge: fixed spelling, improved wording
blob: improved log message on lockf() failure
Merge pull request #43 from SaveTheRbtz/master

Merge and logging improvements