diff mercurial/context.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 dbc3846c09a1
children 0912d8df5e19
line wrap: on
line diff