dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / dot / gtkrc-2.0
2017-07-02 Mark Woodingdot/gtk...: Configuration for Gtk things.