Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3530:4745cf66f77d
Corrected hg synopsis.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 26 Oct 2006 09:22:10 +0200 |
parents | 798bcde0c9c2 |
children | 3b4e00cba57a |