diff templates/filelog.tmpl @ 4384:1386a9cffc88

Add notes about configuring a merge program
author Lee Cantey <lcantey@gmail.com>
date Thu, 26 Apr 2007 23:58:18 -0700
parents 03e7e8958a27
children 46c5e1ee8aaa
line wrap: on
line diff