comparison mercurial/changelog.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 73c918c71300
children 63b9d2deed48
comparison
equal deleted inserted replaced
4383:1bcf38111877 4384:1386a9cffc88