models: properly detect merge conflicts with deleted files
treea89fa608f792a77235172af5d8e7ddef1f70c450
-rw-r--r-- 204 .gitignore
-rw-r--r-- 69 COPYRIGHT
-rw-r--r-- 3468 INSTALL
-rw-r--r-- 17987 LICENSE
-rw-r--r-- 589 MANIFEST.in
-rw-r--r-- 1241 Makefile
-rw-r--r-- 975 README
drwxr-xr-x - bin
drwxr-xr-x - cola
-rw-r--r-- 20 setup.cfg
-rwxr-xr-x 4261 setup.py
drwxr-xr-x - share
drwxr-xr-x - test
drwxr-xr-x - ui