dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
[profile] / dot / cgrc
1 log -c
2 diff -c