Add indent-based folding
Merging... Merging.. Always merging
global gitignore cscope files