add git-show-merges
treef0d57fd956e85d08a571b0a48673a5f5a839e37b
-rw-r--r-- 688 Rakefile
drwxr-xr-x - bin
drwxr-xr-x - www