resolve conflict
commite8f63e985e6aa31df0130d60968ee3c374f26c30
authorvgoah <vgoah@localhost>
Sat, 5 Feb 2011 15:22:24 +0000 (5 15:22 +0000)
committervgoah <vgoah@localhost>
Sat, 5 Feb 2011 15:22:24 +0000 (5 15:22 +0000)
tree41d97369e2e6590bddb99139517e820495d8c0f4
parent37d105f8596182b2f7768e5e9a3574a3105c13f3
resolve conflict
utf-8 correct detect
CYGWIN_HOME
_vimrc