dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / bin / xinitcmd
2009-07-18 Mark WoodingGreat reorganization.