dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / dot / parallel-config
1 ### -*-conf-*-
2 --gnu