dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / kermit / dial.shared
1 ;;; Telephone directory.
2
3 demon +44 (844) 855 5021 ; Demon Dial Companion