dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
[profile] / dot / tclshrc
2011-06-23 Mark Woodingdot/tclshrc: Tcl configuration.