Prune out some extra merge commits by comparing their parents correctly.
tree7dde7f558131c04f7d3a6b222f398fb29f2c6a99
-rw-r--r-- 3 .gitignore
lrwxrwxrwx 14 git-subtree -> git-subtree.sh
-rwxr-xr-x 5411 git-subtree.sh
-rw-r--r-- 23 shellopts.sh
-rwxr-xr-x 1770 test.sh