dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.

[profile] / dot / mdw.session

[GNOME Session]
Name=[mdw]'s not crap session
Required=panel;
Required-panel=gnome-panel
DefaultApps=gnome-settings-daemon;