meldmerge is great! But I also want something I can use on the command line.