dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / dot / cvsrc
1 rdiff -up
2 diff -Nup
3 cvs -z6
4 checkout -P
5 update -dP
6 tag -c
7 remove -f