Only check for upstream merges if not fast-forwarding
tree3b0763dea49de4eee481632bb6bee3d0e50ebcd2
-rw-r--r-- 38 .gitignore
-rw-r--r-- 79 AUTHORS
-rw-r--r-- 17992 COPYING
drwxr-xr-x - Documentation
-rw-r--r-- 292 INSTALL
-rw-r--r-- 448 MANIFEST.in
-rw-r--r-- 397 Makefile
-rw-r--r-- 762 README
-rw-r--r-- 1100 TODO
drwxr-xr-x - contrib
drwxr-xr-x - debian
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