Merge branch 'print_conflicts'
treefaeca59552dfa987e7a2830cb22bb4419644cbd5
-rw-r--r-- 35 .gitignore
-rw-r--r-- 18036 LICENSE
-rw-r--r-- 5950 README.md
-rw-r--r-- 46 Setup.hs
drwxr-xr-x - app
-rw-r--r-- 1597 git-rehi.cabal
-rwxr-xr-x 1360 itest-edit.sh
-rw-r--r-- 21131 itest-repo.data
-rwxr-xr-x 15678 itest.pl
-rw-r--r-- 194 stack.yaml