korya /.gvimrc 

cnoremap q qa
if &diff
  " unfold
  noremap  hzRgglzRgghgg
  " go right
  noremap  l
  " go left
  noremap  h
  " get from right to left (must be on left!!)
  noremap   :diffget
  " get from left to right (must be on left!!)
  noremap   :diffput
  " next match
  map  ]czz
  map  ]czz
  " previous match
  map  [czz
  map  ]czz
  " iwhite
  map   :set diffopt^=iwhite
  map   :set diffopt-=iwhite
  " update the diff
  map   :diffup
 " imap   :diffup
  " quit  (well, duhh !)
  cnoremap q qa

  set guifontset=
  "set guifont=-schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv
   "set guifont=-B&H-LucidaTypewriter-Medium-R-Normal-Sans-12-120-75-75-M-70-ISO8859-9
"  set guifont=-cronyx-fixed-medium-r-semicondensed-*-13-*-*-*-c-*-koi8-r
  set co=165
  exe "normal \="
  "set ea
  set lines=42
  set guioptions-=rRlL
  set fdm=manual
  set diffopt=filler,context:5000

endif
» See more dotfiles like .gvimrc
» See more dotfiles from korya