dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / kermit / net.shared
2012-02-20 Mark WoodingMerge branch 'master' of git://git.distorted.org.uk...
2012-02-20 Mark WoodingImprove Kermit configuration.