diff mercurial/hgweb/request.py @ 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 ca639faa38a2
children ff7253a0d1da
line wrap: on
line diff