modified:   alias
catr alias change
Merge remote-tracking branch 'origin/master'
merge README.md to r.local
modified:   vimrc
revert /my/vimwiki path