I am so, so, so excited for the three way diff/merge tool, but I can't figure out how to start it from the command-line.  Please tell me it's possible or you're going to make a grown man cry.
--