chiark / gitweb /
merge diff3
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 2 Aug 2017 13:19:32 +0000 (14:19 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 2 Aug 2017 13:19:32 +0000 (14:19 +0100)
commit46a8f248fce66f26eceac70122ef1a6439caf576
tree755b286c4d0927d0183af7b0d9cf56b0eac2c38d
parent1f8f61d559ee769be9f3eaadb896195f8fa6339b
merge diff3
templates/gitconfig.in