chiark / gitweb /
dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / dot / cgrc
1 log -c
2 diff -c