Add a dotfiles subdir. Add gitconfig. Add a bin directory and the diffconflicts script.