diff mercurial/localrepo.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 109077e7048d
children 9770d260a405
line wrap: on
line diff