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