Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4011:15955d84bc68
add [diff] section to hgrc documentation
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 29 Dec 2006 04:22:31 +0100 |
| parents | c0a12e6441a5 |
| children | 1e0b94cfba0e c95060a5391a |
comparison
equal
deleted
inserted
replaced
| 4010:e282448d68f1 | 4011:15955d84bc68 |
|---|