comparison mercurial/commands.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 caaba589d9c7
children 9770d260a405
comparison
equal deleted inserted replaced
4383:1bcf38111877 4384:1386a9cffc88