title: Command Line File Diff & Merge via Anaconda's Spyder
body: <p>Does the Spyder IDE provide for file diff &amp; merge configuration via the command line?  I haven't seen anything relevant in their documentation nor have I found a plugin that might provide this functionality.  No relevant options seem to be available by default:</p>
  
  <pre><code>~$ which spyder
  //anaconda/envs/test_env/bin/spyder
  
  ~$ spyder --help
  Usage: spyder [options] files
  
  Options:
    -h, --help            show this help message and exit
    --new-instance        Run a new instance of Spyder, even if the single
                          instance mode has been turned on (default)
    --defaults            Reset configuration settings to defaults
    --reset               Remove all configuration files!
    --optimize            Optimize Spyder bytecode (this may require
                          administrative privileges)
    -w WORKING_DIRECTORY, --workdir=WORKING_DIRECTORY
                          Default working directory
    --show-console        Do not hide parent console window (Windows)
    --multithread         Internal console is executed in another thread
                          (separate from main application thread)
    --profile             Profile mode (internal test, not related with Python
                          profiling)
    --window-title=WINDOW_TITLE
                          String to show in the main window title
    -p OPEN_PROJECT, --project=OPEN_PROJECT
                          Path that contains an Spyder project
  </code></pre>
  
  <p>Thanks for your feedback.</p>