I find the --remerge-diff example extremely confusing, but maybe that's just me. The old-style output is very clear, but I can't figure out the new one.