cleaning up unmerged files after octopus try manually
tree6dd94661988424a76383959994f3e04f0713a77a
-rw-r--r-- 769 README
-rwxr-xr-x 4949 git-test-merge