diff vim @ 10:876f2c45eeae

Use vimdiff for merging.
author Edho Prima Arief <me@myconan.net>
date Tue, 03 Aug 2010 21:14:35 +0700
parents 39ef7f7236fc
children 2cf5492ac78d
line wrap: on
line diff