commit 5a577d970a293afe320b6c3280c10c2bd8a1ff50 Merge: 908b075 96941b3 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Jun 1 22:59:16 2013 -0700 Merge branch 'dotdir-two-chars' of git://github.com/GlitchMr/fish-shell into GlitchMr-dotdir-two-chars commit 96941b3a92e5d7e9dd230e4797ee71285700a41f Author: Konrad Borowski <glitchmr@myopera.com> Date: Sat May 25 09:55:43 2013 +0200 Support BSD sed commit 60652c2bd2d1bbce26c90a010913f0f0d8e9365f Author: Konrad Borowski <glitchmr@myopera.com> Date: Sun May 19 10:58:40 2013 +0200 Show first two characters for dotdirs. Fixes #754.