Simplify merges even more aggressively.
treee922853c022a83abaa447dbbc8091381873f3562
-rw-r--r-- 3 .gitignore
lrwxrwxrwx 14 git-subtree -> git-subtree.sh
-rwxr-xr-x 8611 git-subtree.sh
-rw-r--r-- 23 shellopts.sh
-rwxr-xr-x 4356 test.sh
-rw-r--r-- 247 todo