config :ediff & git
  put the git/ediff.sh in ~/bin/
  added config info & alias ediff to ~/.gitconfig
  set some ediff color