diff tcsh @ 10:876f2c45eeae

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