dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 4 Jul 2017 12:58:45 +0000 (13:58 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 4 Jul 2017 23:40:37 +0000 (00:40 +0100)
commit5ffa4795873e37c6b39cf83df82470c1a7119fa0
tree6939f95f4bed60de3d7e4029ef502f97d4128b95
parent936b72793308aeabbd1bb2d98475e39167bf2014
dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
dot/gitconfig.in