Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/util.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 | e33ad7cea15f |
children | f9cd48bd8625 |