comparison setup @ 10:876f2c45eeae

Use vimdiff for merging.
author Edho Prima Arief <me@myconan.net>
date Tue, 03 Aug 2010 21:14:35 +0700
parents b5d0c1892294
children 73123c5ef818
comparison
equal deleted inserted replaced
9:bb4a42a4c7bb 10:876f2c45eeae