dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
[profile] / dot / cgrc
2009-07-18 Mark WoodingGreat reorganization.