controllers/merge: reformatted code to stay within 80 columns
tree6451aa5b8d12a285de981bc7fa557535e8904509
-rw-r--r-- 204 .gitignore
-rw-r--r-- 69 COPYRIGHT
-rw-r--r-- 2467 INSTALL
-rw-r--r-- 17987 LICENSE
-rw-r--r-- 589 MANIFEST.in
-rw-r--r-- 851 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