Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/ancestor.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 | eb0b4a2d70a9 |
children |
comparison
equal
deleted
inserted
replaced
4383:1bcf38111877 | 4384:1386a9cffc88 |
---|