dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / dot / signature
... / ...
CommitLineData
1[mdw]