msgmerge: fix indent
msgmerge: add --sort-output and --sort-by-file