Add --output option to specify merge result filename (closes bgo#321290)

This patch allows a file (specifically, the second pane) to read from
one file and save to a different one. This allows easier handling of,
for example, three-way merges for certain VC tool integration.