Not very good, but rebase vs. merge.
-rw-r--r-- 2383 README.markdown
drwxr-xr-x - client
drwxr-xr-x - scripts
drwxr-xr-x - server
drwxr-xr-x - tests
-rw-r--r-- 3628 workflow.markdown