Refactor to do diff per commit and only show conflicted changes in merges.
drwxr-xr-x - cbas
drwxr-xr-x - client
-rw-r--r-- 769 install-cbas-client-hooks.sh
-rw-r--r-- 232 make-cbas-client-hooks.sh
drwxr-xr-x - scripts
drwxr-xr-x - server
drwxr-xr-x - tests