Add option to automatically invoke the interactive merger
tree7049d43d1148441bb132f28b0c986f889e2a64be
-rw-r--r-- 30 .gitignore
-rw-r--r-- 79 AUTHORS
-rw-r--r-- 17992 COPYING
-rw-r--r-- 292 INSTALL
-rw-r--r-- 184 MANIFEST.in
-rw-r--r-- 341 Makefile
-rw-r--r-- 762 README
-rw-r--r-- 1184 TODO
drwxr-xr-x - contrib
drwxr-xr-x - debian
drwxr-xr-x - doc
drwxr-xr-x - examples
-rw-r--r-- 23 setup.cfg
-rwxr-xr-x 987 setup.py
-rwxr-xr-x 1504 stg
-rwxr-xr-x 1520 stg-dbg
-rwxr-xr-x 1796 stg-prof
drwxr-xr-x - stgit
drwxr-xr-x - t
drwxr-xr-x - templates