dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / git /
drwxr-xr-x   ..
-rw-r--r-- 196 attributes
-rw-r--r-- 299 gitignore