fixes (merge continuation sh -> bash)
treeab2a1646cd36b720eb583a589b865b5cfebe868d
-rw-r--r-- 769 README
-rwxr-xr-x 4659 git-test-merge